Mercurial > hg > orthanc-tests
annotate Tests/Tests.py @ 502:070bc47f4f3e
removed print
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 19 Dec 2022 15:46:50 +0100 |
| parents | 1b1bb8621021 |
| children | 138d5efd4407 |
| rev | line source |
|---|---|
| 22 | 1 #!/usr/bin/env python |
| 2 # -*- coding: utf-8 -*- | |
| 3 | |
| 4 | |
| 3 | 5 # Orthanc - A Lightweight, RESTful DICOM Store |
| 73 | 6 # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
| 3 | 7 # Department, University Hospital of Liege, Belgium |
|
449
06eea14c5906
upgrade year to 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
448
diff
changeset
|
8 # Copyright (C) 2017-2022 Osimis S.A., Belgium |
|
06eea14c5906
upgrade year to 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
448
diff
changeset
|
9 # Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
| 3 | 10 # |
| 11 # This program is free software: you can redistribute it and/or | |
| 12 # modify it under the terms of the GNU General Public License as | |
| 13 # published by the Free Software Foundation, either version 3 of the | |
| 14 # License, or (at your option) any later version. | |
| 15 # | |
| 16 # This program is distributed in the hope that it will be useful, but | |
| 17 # WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 19 # General Public License for more details. | |
| 20 # | |
| 21 # You should have received a copy of the GNU General Public License | |
| 22 # along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 23 | |
| 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 | 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 | 32 import tempfile |
| 3 | 33 import unittest |
| 34 | |
| 11 | 35 from PIL import ImageChops |
| 3 | 36 from Toolbox import * |
| 13 | 37 from xml.dom import minidom |
| 312 | 38 from datetime import datetime |
| 3 | 39 |
| 40 _LOCAL = None | |
| 41 _REMOTE = None | |
|
306
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
42 _DOCKER = False |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
43 |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
44 |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
45 def SetOrthancParameters(local, remote, withinDocker): |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
46 global _LOCAL, _REMOTE, _DOCKER |
| 3 | 47 _LOCAL = local |
| 48 _REMOTE = remote | |
|
306
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
49 _DOCKER = withinDocker |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
50 |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
51 |
| 14 | 52 def ExtractDicomTags(rawDicom, tags): |
| 53 with tempfile.NamedTemporaryFile(delete = True) as f: | |
| 54 f.write(rawDicom) | |
| 55 f.flush() | |
| 45 | 56 data = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ]) |
| 14 | 57 |
| 58 result = [] | |
| 59 for tag in tags: | |
| 60 match = re.search('<element[^>]+name="%s">([^>]*)</element>' % tag, data) | |
| 61 if match == None: | |
| 62 result.append('') | |
| 63 else: | |
| 64 result.append(match.group(1)) | |
| 65 | |
| 66 return result | |
| 67 | |
| 68 | |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
69 def CompareLists(a, b): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
70 if len(a) != len(b): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
71 return False |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
72 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
73 for i in range(len(a)): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
74 d = a[i] - b[i] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
75 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
|
76 return False |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
77 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
78 return True |
|
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 |
|
80
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
81 def CompareTags(a, b, tagsToIgnore): |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
82 for i in tagsToIgnore: |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
83 if i in a: |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
84 del a[i] |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
85 if i in b: |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
86 del b[i] |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
87 |
| 123 | 88 if a.keys() == b.keys(): |
| 89 return True | |
| 90 else: | |
| 91 print('Mismatch in tags: %s' % str(set(a.keys()) ^ set(b.keys()))) | |
| 92 return False | |
|
80
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
93 |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
94 |
|
71
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
95 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
|
96 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
|
97 '-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
|
98 _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
|
99 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
|
100 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
|
101 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
102 |
| 142 | 103 def GetMoveScuCommand(): |
| 104 return [ | |
| 105 FindExecutable('movescu'), | |
| 106 '--move', _LOCAL['DicomAet'], # Target AET (i.e. storescp) | |
| 107 '--call', _REMOTE['DicomAet'], # Called AET (i.e. Orthanc) | |
| 108 '--aetitle', _LOCAL['DicomAet'], # Calling AET (i.e. storescp) | |
| 109 _REMOTE['Server'], | |
| 110 str(_REMOTE['DicomPort']) | |
| 111 ] | |
| 112 | |
|
231
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
113 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
114 def IsDicomUntilPixelDataStored(orthanc): |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
115 # 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
|
116 # "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
|
117 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
118 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
|
119 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
|
120 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
|
121 if a != 0x03a0: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
122 raise Exception('Internal error') |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
123 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
124 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
|
125 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
|
126 raise Exception('Internal error') |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
127 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
128 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
|
129 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
130 if len(a) == 1: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
131 return False |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
132 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
|
133 return True |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
134 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
135 raise Exception('Internal error') |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
136 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
137 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
138 return False |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
139 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
140 |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
141 def CallMoveScu(args): |
|
231
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
142 try: |
|
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
143 subprocess.check_call(GetMoveScuCommand() + args, |
|
318
bac7cc80f240
dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
315
diff
changeset
|
144 stderr = subprocess.PIPE) |
|
231
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
145 except subprocess.CalledProcessError as e: |
|
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
146 # 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
|
147 # 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
|
148 # 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
|
149 # DICOM instances. |
|
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
150 # 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
|
151 if e.returncode != 69: |
|
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
152 raise e |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
153 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
154 |
|
51
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
155 def GenerateTestSequence(): |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
156 return [ |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
157 { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
158 'StudyDescription': 'Hello^', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
159 'ReferencedStudySequence' : [ |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
160 { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
161 'StudyDescription': 'Toto', |
|
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 { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
164 'StudyDescription': 'Tata', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
165 }, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
166 ] |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
167 }, |
|
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 'StudyDescription': 'Sébastien^', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
170 'StudyDate' : '19700202', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
171 } |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
172 ] |
|
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 |
| 3 | 175 class Orthanc(unittest.TestCase): |
| 176 def setUp(self): | |
| 83 | 177 if (sys.version_info >= (3, 0)): |
| 178 # Remove annoying warnings about unclosed socket in Python 3 | |
| 179 import warnings | |
| 180 warnings.simplefilter("ignore", ResourceWarning) | |
| 181 | |
| 3 | 182 DropOrthanc(_LOCAL) |
| 183 DropOrthanc(_REMOTE) | |
| 174 | 184 UninstallLuaCallbacks(_REMOTE) |
|
423
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
185 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
186 # Reset stuff possibly set by some integration tests |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
187 DoPut(_REMOTE, '/tools/default-encoding', 'Latin1') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
188 DoPut(_REMOTE, '/tools/accepted-transfer-syntaxes', [ '1.2.840.10008.1.*' ]) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
189 DoPut(_REMOTE, '/tools/unknown-sop-class-accepted', '0') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
190 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
191 for i in [ 'toto', 'tata' ]: |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
192 if i in DoGet(_REMOTE, '/modalities'): |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
193 DoDelete(_REMOTE, '/modalities/%s' % i) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
194 if i in DoGet(_REMOTE, '/peers'): |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
195 DoDelete(_REMOTE, '/peers/%s' % i) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
196 |
| 312 | 197 #print("%s: In test %s" % (datetime.now(), self._testMethodName)) |
|
44
ffa542cce638
Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
198 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
199 def AssertSameImages(self, truth, url): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
200 im = GetImage(_REMOTE, url) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
201 self.assertTrue(CompareLists(truth, im.getdata())) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
202 |
| 3 | 203 |
| 204 def test_system(self): | |
| 177 | 205 self.assertTrue('Version' in DoGet(_REMOTE, '/system')) |
| 206 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 207 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 208 | |
| 471 | 209 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 210 system = DoGet(_REMOTE, '/system') | |
| 211 self.assertIn("MainDicomTags", system) | |
| 212 self.assertIn("Patient", system["MainDicomTags"]) | |
| 472 | 213 self.assertIn("Study", system["MainDicomTags"]) |
| 471 | 214 self.assertIn("Series", system["MainDicomTags"]) |
| 215 self.assertIn("Instance", system["MainDicomTags"]) | |
| 216 | |
| 177 | 217 systemInfo = DoGet(_REMOTE, '/system') |
| 218 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
|
219 print("Skipping version checks since you're currently in mainline") |
| 177 | 220 return |
| 221 | |
| 173 | 222 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 8, 6)) |
| 223 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 8, 7)) | |
| 224 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 7, 6)) | |
| 225 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 9, 6)) | |
| 226 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 1, 8, 6)) | |
| 3 | 227 |
| 456 | 228 |
| 3 | 229 def test_upload(self): |
| 173 | 230 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) |
| 231 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 232 | |
| 233 sizeDummyCT = 2472 | |
| 234 sizeOverwrite = 2476 | |
| 235 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d' | |
| 236 | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
237 # This file has *no* pixel data => "dicom-until-pixel-data" is not created |
| 3 | 238 u = UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
239 isCompressed = (DoGet(_REMOTE, '/instances/%s/attachments/dicom/is-compressed' % u['ID']) != 0) |
| 183 | 240 self.assertEqual(instance, u['ID']) |
| 3 | 241 self.assertEqual('Success', u['Status']) |
| 173 | 242 |
| 183 | 243 if True: |
| 244 # New test for Orthanc 1.4.3 | |
| 245 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', u['ParentSeries']) | |
| 246 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', u['ParentStudy']) | |
| 247 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', u['ParentPatient']) | |
| 248 | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
249 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
250 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
|
251 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
|
252 j = 0 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
253 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
254 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
|
255 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
|
256 |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
257 if IsOrthancVersionAbove(_REMOTE, 1, 10, 0): |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
258 attachmentInfo = DoGet(_REMOTE, '/instances/%s/attachments/dicom/info' % instance) |
| 447 | 259 |
| 260 if isCompressed: | |
| 261 self.assertGreater(sizeDummyCT, attachmentInfo['CompressedSize']) | |
| 262 else: | |
| 263 self.assertEqual(sizeDummyCT, attachmentInfo['CompressedSize']) | |
| 264 | |
|
445
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
265 self.assertEqual(sizeDummyCT, attachmentInfo['UncompressedSize']) |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
266 self.assertIn('Uuid', attachmentInfo) |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
267 self.assertEqual(1, attachmentInfo['ContentType']) |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
268 |
| 173 | 269 s = sizeDummyCT + j |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
270 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
271 if isCompressed: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
272 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
|
273 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
274 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
|
275 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
276 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 173 | 277 |
| 3 | 278 u = UploadInstance(_REMOTE, 'DummyCT.dcm') |
| 279 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 280 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 281 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 282 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
|
283 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
284 if isCompressed: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
285 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
|
286 else: |
|
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')['TotalDiskSize'])) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
288 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
289 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 173 | 290 |
| 291 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance) | |
| 3 | 292 self.assertEqual('20070101', i['StudyDate']) |
| 173 | 293 self.assertEqual('KNIX', i['PatientName']) |
| 294 | |
| 295 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2): | |
| 296 # Overwriting | |
| 297 self.assertEqual('Success', u['Status']) | |
| 298 else: | |
| 299 self.assertEqual('AlreadyStored', u['Status']) | |
| 300 | |
| 301 u = UploadInstance(_REMOTE, 'DummyCT-overwrite.dcm') | |
| 302 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 303 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 304 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 305 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 306 | |
| 307 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2): | |
| 308 # Overwriting | |
| 309 self.assertEqual('Success', u['Status']) | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
310 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
311 j2 = 0 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
312 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
313 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
|
314 self.assertNotEqual(j, j2) |
| 173 | 315 s2 = sizeOverwrite + j2 |
| 316 self.assertNotEqual(s, s2) | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
317 if isCompressed: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
318 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
|
319 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
320 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
|
321 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
322 self.assertEqual(s2, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 173 | 323 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance) |
| 324 self.assertEqual('ANOTHER', i['PatientName']) | |
| 325 else: | |
| 326 self.assertEqual('AlreadyStored', u['Status']) | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
327 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
|
328 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 3 | 329 |
| 5 | 330 def test_upload_2(self): |
| 3 | 331 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
| 332 instance = DoGet(_REMOTE, '/instances/%s' % i) | |
| 333 self.assertEqual(i, instance['ID']) | |
| 334 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', | |
| 335 instance['MainDicomTags']['SOPInstanceUID']) | |
| 336 | |
| 337 series = DoGet(_REMOTE, '/series/%s' % instance['ParentSeries']) | |
| 338 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 339 series['MainDicomTags']['SeriesInstanceUID']) | |
| 340 | |
| 341 study = DoGet(_REMOTE, '/studies/%s' % series['ParentStudy']) | |
| 342 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 343 study['MainDicomTags']['StudyInstanceUID']) | |
| 344 | |
| 345 patient = DoGet(_REMOTE, '/patients/%s' % study['ParentPatient']) | |
| 346 self.assertEqual('ozp00SjY2xG', | |
| 347 patient['MainDicomTags']['PatientID']) | |
| 348 | |
| 349 dicom = DoGet(_REMOTE, '/instances/%s/file' % instance['ID']) | |
| 350 self.assertEqual(2472, len(dicom)) | |
| 351 self.assertEqual('3e29b869978b6db4886355a2b1132124', ComputeMD5(dicom)) | |
| 352 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 353 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/simplified-tags' % i)['StationName']) | |
| 354 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
|
355 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
|
356 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/tags?short' % i)['0008,1010']) |
| 3 | 357 |
| 358 | |
| 5 | 359 def test_images(self): |
| 360 i = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID'] | |
| 361 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 3 | 362 |
| 5 | 363 im = GetImage(_REMOTE, '/instances/%s/preview' % i) |
| 364 self.assertEqual("L", im.mode) | |
| 365 self.assertEqual(512, im.size[0]) | |
| 366 self.assertEqual(358, im.size[1]) | |
| 367 | |
| 368 im = GetImage(_REMOTE, '/instances/%s/image-uint8' % i) | |
| 369 self.assertEqual("L", im.mode) | |
| 370 self.assertEqual(512, im.size[0]) | |
| 371 self.assertEqual(358, im.size[1]) | |
| 372 | |
| 373 im = GetImage(_REMOTE, '/instances/%s/image-uint16' % i) | |
| 374 self.assertEqual(512, im.size[0]) | |
| 375 self.assertEqual(358, im.size[1]) | |
| 376 | |
| 377 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i) | |
| 378 self.assertEqual("L", im.mode) | |
| 379 self.assertEqual(512, im.size[0]) | |
| 380 self.assertEqual(358, im.size[1]) | |
| 381 | |
| 382 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint8' % i) | |
| 383 self.assertEqual("L", im.mode) | |
| 384 self.assertEqual(512, im.size[0]) | |
| 385 self.assertEqual(358, im.size[1]) | |
| 386 | |
| 387 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint16' % i) | |
| 388 self.assertEqual(512, im.size[0]) | |
| 389 self.assertEqual(358, im.size[1]) | |
| 64 | 390 |
| 391 # This is Little Endian Explicit | |
| 392 self.assertEqual('1.2.840.10008.1.2.1', DoGet(_REMOTE, '/instances/%s/header?simplify' % i)['TransferSyntaxUID']) | |
| 393 | |
|
464
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
394 def test_images_implicit_vr(self): |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
395 if IsOrthancVersionAbove(_REMOTE, 1, 10, 2): |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
396 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
|
397 |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
398 im = GetImage(_REMOTE, '/instances/%s/preview' % i) |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
399 self.assertEqual("RGB", im.mode) |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
400 self.assertEqual(800, im.size[0]) |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
401 self.assertEqual(600, im.size[1]) |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
402 |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
403 |
| 6 | 404 def test_hierarchy(self): |
| 405 UploadFolder(_REMOTE, 'Brainix/Epi') | |
| 406 UploadFolder(_REMOTE, 'Brainix/Flair') | |
| 407 UploadFolder(_REMOTE, 'Knee/T1') | |
| 408 UploadFolder(_REMOTE, 'Knee/T2') | |
| 409 | |
| 410 p = DoGet(_REMOTE, '/patients') | |
| 411 s = DoGet(_REMOTE, '/studies') | |
| 412 t = DoGet(_REMOTE, '/series') | |
| 413 self.assertEqual(2, len(p)) | |
| 414 self.assertEqual(2, len(s)) | |
| 415 self.assertEqual(4, len(t)) | |
| 416 self.assertEqual(94, len(DoGet(_REMOTE, '/instances'))) | |
| 417 | |
| 418 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0' | |
| 419 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' | |
| 420 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8' | |
| 421 brainixFlair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' | |
| 422 | |
| 423 kneePatient = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' | |
| 424 kneeStudy = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' | |
| 425 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' | |
| 426 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' | |
| 427 | |
| 428 self.assertTrue(brainixPatient in p) | |
| 429 self.assertTrue(kneePatient in p) | |
| 430 self.assertTrue(brainixStudy in s) | |
| 431 self.assertTrue(kneeStudy in s) | |
| 432 self.assertTrue(brainixEpi in t) | |
| 433 self.assertTrue(brainixFlair in t) | |
| 434 self.assertTrue(kneeT1 in t) | |
| 435 self.assertTrue(kneeT2 in t) | |
| 436 | |
| 437 self.assertEqual(44, len(DoGet(_REMOTE, '/patients/%s/instances' % brainixPatient))) | |
| 438 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % brainixPatient))) | |
| 439 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % brainixPatient))) | |
| 440 | |
| 441 self.assertEqual(50, len(DoGet(_REMOTE, '/patients/%s/instances' % kneePatient))) | |
| 442 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % kneePatient))) | |
| 443 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % kneePatient))) | |
| 444 | |
| 445 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % brainixStudy))) | |
| 446 self.assertEqual(44, len(DoGet(_REMOTE, '/studies/%s/instances' % brainixStudy))) | |
| 447 | |
| 448 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % kneeStudy))) | |
| 449 self.assertEqual(50, len(DoGet(_REMOTE, '/studies/%s/instances' % kneeStudy))) | |
| 450 | |
| 451 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixEpi))) | |
| 452 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixFlair))) | |
| 453 self.assertEqual(24, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT1))) | |
| 454 self.assertEqual(26, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT2))) | |
| 455 | |
| 456 for patient in p: | |
| 457 for study in DoGet(_REMOTE, '/patients/%s/studies' % patient): | |
| 458 self.assertEqual(patient, study['ParentPatient']) | |
| 459 for series in DoGet(_REMOTE, '/studies/%s/series' % study['ID']): | |
| 460 self.assertEqual(study['ID'], series['ParentStudy']) | |
| 211 | 461 self.assertEqual('Unknown', series['Status']) |
| 6 | 462 for instance in DoGet(_REMOTE, '/series/%s/instances' % series['ID']): |
| 463 self.assertEqual(series['ID'], instance['ParentSeries']) | |
| 464 | |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
465 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
|
466 # 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
|
467 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
|
468 json.dumps(DoGet(_REMOTE, '/instances/%s/tags' % instance['ID']))) |
| 6 | 469 |
| 470 | |
| 471 r = DoDelete(_REMOTE, "/studies/%s" % brainixStudy)['RemainingAncestor'] | |
| 472 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 473 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 474 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 475 self.assertEqual(50, len(DoGet(_REMOTE, '/instances'))) | |
| 476 self.assertEqual(None, r) | |
| 477 | |
| 478 r = DoDelete(_REMOTE, "/series/%s" % kneeT2)['RemainingAncestor'] | |
| 479 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 480 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 481 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 482 self.assertEqual(24, len(DoGet(_REMOTE, '/instances'))) | |
| 483 self.assertEqual('Study', r['Type']) | |
| 484 self.assertEqual(kneeStudy, r['ID']) | |
| 485 | |
| 486 r = DoDelete(_REMOTE, "/instances/%s" % DoGet(_REMOTE, '/instances')[0])['RemainingAncestor'] | |
| 487 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 488 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 489 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 490 self.assertEqual(23, len(DoGet(_REMOTE, '/instances'))) | |
| 491 self.assertEqual('Series', r['Type']) | |
| 492 self.assertEqual(kneeT1, r['ID']) | |
| 493 | |
| 494 r = DoDelete(_REMOTE, "/patients/%s" % kneePatient)['RemainingAncestor'] | |
| 495 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 496 self.assertEqual(0, len(DoGet(_REMOTE, '/studies'))) | |
| 497 self.assertEqual(0, len(DoGet(_REMOTE, '/series'))) | |
| 498 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 499 self.assertEqual(None, r) | |
| 500 | |
| 501 DropOrthanc(_REMOTE) | |
| 502 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 503 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 7 | 504 |
|
213
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
505 def test_delete_cascade(self): |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
506 # 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
|
507 |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
508 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
|
509 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
|
510 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
|
511 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
|
512 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
|
513 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
|
514 |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
515 DoDelete(_REMOTE, '/instances/%s' % a) |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
516 |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
517 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
|
518 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
|
519 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
|
520 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
|
521 |
| 7 | 522 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
523 def test_multiframe(self): |
| 7 | 524 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] |
| 525 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 526 | |
| 527 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i) | |
| 528 self.assertEqual("L", im.mode) | |
| 529 self.assertEqual(512, im.size[0]) | |
| 530 self.assertEqual(512, im.size[1]) | |
| 531 | |
| 532 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint8' % i) | |
| 533 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint16' % i) | |
| 534 DoGet(_REMOTE, '/instances/%s/frames/75/preview' % i) | |
| 535 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/aaa/preview' % i)) | |
| 536 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/76/preview' % i)) | |
| 537 | |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
538 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
539 def test_changes(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
540 # Check emptiness |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
541 c = DoGet(_REMOTE, '/changes') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
542 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
|
543 #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
|
544 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
545 c = DoGet(_REMOTE, '/changes?last') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
546 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
|
547 #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
|
548 self.assertTrue(c['Done']) |
|
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 # Add 1 instance |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
551 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
|
552 c = DoGet(_REMOTE, '/changes') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
553 begin = c['Last'] |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
554 self.assertEqual(4, len(c['Changes'])) |
|
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 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
|
557 |
|
390
5c2472f008eb
Check the order in which the creation events are reported
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
389
diff
changeset
|
558 # 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
|
559 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
|
560 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
|
561 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
|
562 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
|
563 |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
564 c = DoGet(_REMOTE, '/changes?last') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
565 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
566 self.assertEqual(begin, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
567 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
568 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
|
569 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
570 self.assertEqual(begin, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
571 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
572 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
|
573 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
574 self.assertEqual(begin - 1, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
575 self.assertFalse(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
576 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
|
577 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
578 self.assertEqual(begin - 2, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
579 self.assertFalse(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
580 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
581 UploadFolder(_REMOTE, 'Knee/T1') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
582 UploadFolder(_REMOTE, 'Knee/T2') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
583 since = begin |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
584 countPatients = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
585 countStudies = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
586 countSeries = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
587 countInstances = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
588 completed = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
589 while True: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
590 c = DoGet(_REMOTE, '/changes', { 'since' : since, 'limit' : 3 }) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
591 since = c['Last'] |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
592 for i in c['Changes']: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
593 if i['ResourceType'] == 'Instance': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
594 countInstances += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
595 if i['ResourceType'] == 'Patient': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
596 countPatients += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
597 if i['ResourceType'] == 'Study': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
598 countStudies += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
599 if i['ResourceType'] == 'Series': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
600 countSeries += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
601 if i['ChangeType'] == 'NewInstance': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
602 countInstances += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
603 if i['ChangeType'] == 'NewPatient': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
604 countPatients += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
605 if i['ChangeType'] == 'NewStudy': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
606 countStudies += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
607 if i['ChangeType'] == 'NewSeries': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
608 countSeries += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
609 if i['ChangeType'] == 'CompletedSeries': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
610 completed += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
611 self.assertTrue('ID' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
612 self.assertTrue('Path' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
613 self.assertTrue('Seq' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
614 if c['Done']: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
615 break |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
616 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
617 self.assertEqual(2 * 50, countInstances) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
618 self.assertEqual(2 * 1, countPatients) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
619 self.assertEqual(2 * 1, countStudies) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
620 self.assertEqual(2 * 2, countSeries) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
621 self.assertEqual(0, completed) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
622 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
623 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
624 def test_archive(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
625 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
|
626 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') |
| 192 | 627 knee = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' |
| 628 | |
| 629 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
|
630 self.assertEqual(2, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
631 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
632 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
|
633 self.assertEqual(2, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
634 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
635 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
|
636 self.assertEqual(1, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
637 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
638 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') |
| 192 | 639 brainix = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0' |
| 640 | |
| 641 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
|
642 self.assertEqual(2, len(z.namelist())) |
| 192 | 643 |
| 644 z = PostArchive(_REMOTE, '/tools/create-archive', { | |
| 645 'Resources' : [ brainix, knee ] | |
| 646 }) | |
| 647 self.assertEqual(3, len(z.namelist())) | |
|
403
e08e15befa0c
test sync POST to /archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
648 |
|
e08e15befa0c
test sync POST to /archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
649 z = PostArchive(_REMOTE, '/patients/%s/archive' % knee, { |
|
e08e15befa0c
test sync POST to /archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
650 'Synchronous' : True |
|
e08e15befa0c
test sync POST to /archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
651 }) |
|
e08e15befa0c
test sync POST to /archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
652 self.assertEqual(2, len(z.namelist())) |
| 192 | 653 |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
654 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
655 def test_media_archive(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
656 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
|
657 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
|
658 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
659 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
|
660 self.assertEqual(3, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
661 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
|
662 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
|
663 self.assertTrue('DICOMDIR' in z.namelist()) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
664 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
665 try: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
666 os.remove('/tmp/DICOMDIR') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
667 except: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
668 # The file does not exist |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
669 pass |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
670 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
671 z.extract('DICOMDIR', '/tmp') |
| 45 | 672 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
|
673 stderr = subprocess.STDOUT).split('\n') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
674 self.assertEqual(3, len(a)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
675 self.assertTrue(a[0].startswith('Warning')) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
676 self.assertEqual('BasicDirectory', a[1]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
677 self.assertEqual('', a[2]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
678 |
| 45 | 679 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
|
680 stderr = subprocess.STDOUT).split('\n') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
681 self.assertEqual(1, len(a)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
682 self.assertEqual('', a[0]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
683 |
| 45 | 684 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
|
685 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
|
686 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
|
687 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
688 os.remove('/tmp/DICOMDIR') |
| 10 | 689 |
| 690 | |
| 691 def test_protection(self): | |
| 692 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 693 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 694 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 695 a = DoGet(_REMOTE, '/patients')[0] | |
| 696 b = DoGet(_REMOTE, '/patients')[1] | |
| 697 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 698 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain') | |
| 699 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 700 DoPut(_REMOTE, '/patients/%s/protected' % a, '1', 'text/plain') | |
| 701 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 702 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain') | |
| 703 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 704 | |
| 705 | |
| 12 | 706 def test_raw_tags(self): |
| 10 | 707 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] |
| 708 | |
| 709 dicom = DoGet(_REMOTE, '/instances/%s/file' % i) | |
| 710 self.assertEqual('1a7c56cb02d6e742cc9c856a8ac182e3', ComputeMD5(dicom)) | |
| 711 | |
| 712 s = '/instances/%s/content/' % i | |
| 713 | |
| 714 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, s + '0008-1010').strip()) | |
| 715 self.assertRaises(Exception, lambda: DoGet(_REMOTE, s + '0008-1011')) | |
| 716 | |
| 717 self.assertEqual('Abdomen', DoGet(_REMOTE, s + '7fe1-1001/0/7fe1-1008/0/7fe1-1057').strip()) | |
| 718 self.assertEqual('cla_3c', DoGet(_REMOTE, s + '7fe1-1001/0/7fe1-1008/8/7fe1-1057').strip()) | |
| 719 | |
| 720 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 721 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 722 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 723 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 724 | |
| 725 for i in DoGet(_REMOTE, '/instances'): | |
| 726 aid = DoGet(_REMOTE, '/instances/%s' % i)['MainDicomTags']['SOPInstanceUID'] | |
| 727 self.assertEqual(aid, DoGet(_REMOTE, '/instances/%s/content/0008-0018' % i).replace(chr(0), '')) | |
| 728 | |
| 729 | |
| 730 def test_raw_tags_mdn(self): | |
| 731 # Bug reported by Cyril Paulus | |
| 732 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] | |
| 733 self.assertAlmostEqual(0.000027, DoGet(_REMOTE, '/instances/%s/content/7053-1000' % i)) | |
| 734 | |
| 735 | |
| 736 def test_modify_instance(self): | |
| 737 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] | |
| 738 modified = DoPost(_REMOTE, '/instances/%s/modify' % i, | |
| 739 json.dumps({ | |
| 740 "Replace" : { | |
| 741 "PatientName" : "hello", | |
| 742 #"PatientID" : "world" | |
| 743 }, | |
| 744 "Remove" : [ "StationName" ], | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
745 "RemovePrivateTags" : True |
| 10 | 746 }), |
| 747 'application/json') | |
| 748 j = DoPost(_REMOTE, '/instances', modified, 'application/dicom')['ID'] | |
| 749 | |
| 750 self.assertNotEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 751 #self.assertNotEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % i).strip()) | |
| 83 | 752 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i).strip()) |
| 10 | 753 DoGet(_REMOTE, '/instances/%s/content/6003-1010' % i) # Some private tag |
| 754 | |
| 755 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 756 #self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % j).strip()) | |
| 757 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j)) | |
| 758 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/6003-1010' % j)) | |
| 759 | |
| 760 | |
| 761 def test_modify_series(self): | |
| 762 # Upload 4 images from the same series | |
| 763 for i in range(4): | |
| 764 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 765 | |
| 766 origSeries = DoGet(_REMOTE, '/series')[0] | |
| 767 newSeries = DoPost(_REMOTE, '/series/%s/modify' % origSeries, | |
| 768 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 769 'application/json')['ID'] | |
| 770 | |
| 771 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['ModifiedFrom']) | |
| 772 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances'] | |
| 773 self.assertEqual(4, len(instances)) | |
| 774 for i in instances: | |
| 775 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom'] | |
| 776 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 777 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 778 | |
| 779 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 780 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 781 | |
| 782 | |
| 783 def test_modify_study(self): | |
| 784 # Upload 4 images from the 2 series of the same study | |
| 785 for i in range(4): | |
| 786 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 787 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 788 | |
| 789 origStudy = DoGet(_REMOTE, '/studies')[0] | |
| 790 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy, | |
| 791 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 792 'application/json')['ID'] | |
| 793 | |
| 794 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['ModifiedFrom']) | |
| 795 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series'] | |
| 796 self.assertEqual(2, len(series)) | |
| 797 for s in series: | |
| 798 ss = DoGet(_REMOTE, '/series/%s' % s)['ModifiedFrom'] | |
| 799 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy']) | |
| 800 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy']) | |
| 801 | |
| 802 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances'] | |
| 803 for i in instances: | |
| 804 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom'] | |
| 805 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 806 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 807 | |
| 808 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 809 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 810 | |
| 811 | |
| 812 def test_anonymize_series(self): | |
| 813 # Upload 4 images from the same series | |
| 814 for i in range(4): | |
| 815 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 816 | |
| 817 origSeries = DoGet(_REMOTE, '/series')[0] | |
| 818 newSeries = DoPost(_REMOTE, '/series/%s/anonymize' % origSeries, | |
| 819 '{}', | |
| 820 'application/json')['ID'] | |
| 821 | |
| 822 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['AnonymizedFrom']) | |
| 823 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances'] | |
| 824 self.assertEqual(4, len(instances)) | |
| 825 for i in instances: | |
| 826 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom'] | |
| 827 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 828 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 829 | |
| 830 DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j) | |
| 831 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i)) | |
| 832 | |
| 833 | |
| 834 def test_anonymize_study(self): | |
| 835 # Upload 4 images from the 2 series of the same study | |
| 836 for i in range(4): | |
| 837 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 838 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 839 | |
| 840 origStudy = DoGet(_REMOTE, '/studies')[0] | |
| 841 newStudy = DoPost(_REMOTE,'/studies/%s/anonymize' % origStudy, | |
| 842 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 843 'application/json')['ID'] | |
| 844 | |
| 845 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['AnonymizedFrom']) | |
| 846 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series'] | |
| 847 self.assertEqual(2, len(series)) | |
| 848 for s in series: | |
| 849 ss = DoGet(_REMOTE, '/series/%s' % s)['AnonymizedFrom'] | |
| 850 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy']) | |
| 851 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy']) | |
| 852 | |
| 853 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances'] | |
| 854 for i in instances: | |
| 855 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom'] | |
| 856 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 857 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 858 | |
| 859 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 860 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 11 | 861 |
| 862 | |
| 863 | |
| 864 def test_storescu(self): | |
| 865 # Check emptiness | |
| 866 e = DoGet(_REMOTE, '/exports') | |
| 867 self.assertEqual(0, len(e['Exports'])) | |
| 868 self.assertEqual(0, e['Last']) | |
| 869 self.assertTrue(e['Done']) | |
| 870 e = DoGet(_REMOTE, '/exports?last') | |
| 871 self.assertEqual(0, len(e['Exports'])) | |
| 872 self.assertEqual(0, e['Last']) | |
| 873 self.assertTrue(e['Done']) | |
| 874 | |
| 875 # Add 1 instance | |
| 876 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 877 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 878 | |
| 879 # Export the instance | |
| 880 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') # instance | |
| 881 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 882 self.assertEqual(1, len(DoGet(_LOCAL, '/studies'))) | |
| 883 self.assertEqual(1, len(DoGet(_LOCAL, '/series'))) | |
| 884 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 885 | |
| 886 e = DoGet(_REMOTE, '/exports') | |
| 887 self.assertEqual(1, len(e['Exports'])) | |
| 888 self.assertTrue(e['Done']) | |
| 889 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 890 e = DoGet(_REMOTE, '/exports?limit=1') | |
| 891 self.assertEqual(1, len(e['Exports'])) | |
| 892 self.assertTrue(e['Done']) | |
| 893 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 894 e = DoGet(_REMOTE, '/exports?last') | |
| 895 self.assertEqual(1, len(e['Exports'])) | |
| 896 self.assertTrue(e['Done']) | |
| 897 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 898 seqInstance = e['Last'] | |
| 899 | |
| 900 # Export the series | |
| 901 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', 'text/plain') | |
| 902 | |
| 903 e = DoGet(_REMOTE, '/exports') | |
| 904 self.assertEqual(2, len(e['Exports'])) | |
| 905 self.assertTrue(e['Done']) | |
| 906 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 907 seqSeries = e['Last'] | |
| 908 self.assertNotEqual(seqInstance, seqSeries) | |
| 909 e = DoGet(_REMOTE, '/exports?limit=1&since=0') | |
| 910 self.assertEqual(1, len(e['Exports'])) | |
| 911 self.assertFalse(e['Done']) | |
| 912 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance) | |
| 913 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance)) | |
| 914 self.assertEqual(1, len(e['Exports'])) | |
| 915 self.assertTrue(e['Done']) | |
| 916 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 917 e = DoGet(_REMOTE, '/exports?last') | |
| 918 self.assertEqual(1, len(e['Exports'])) | |
| 919 self.assertTrue(e['Done']) | |
| 920 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 921 | |
| 922 # Export the study | |
| 923 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', 'text/plain') | |
| 924 seqStudy = DoGet(_REMOTE, '/exports')['Last'] | |
| 925 | |
| 926 # Export the patient | |
| 927 j = DoPost(_REMOTE, '/modalities/orthanctest/store', '6816cb19-844d5aee-85245eba-28e841e6-2414fae2', 'text/plain') | |
| 928 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 929 self.assertEqual(1, len(DoGet(_LOCAL, '/studies'))) | |
| 930 self.assertEqual(1, len(DoGet(_LOCAL, '/series'))) | |
| 931 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 932 | |
| 933 e = DoGet(_REMOTE, '/exports') | |
| 934 self.assertEqual(4, len(e['Exports'])) | |
| 935 self.assertTrue(e['Done']) | |
| 936 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 937 seqPatient = e['Last'] | |
| 938 self.assertNotEqual(seqInstance, seqSeries) | |
| 939 self.assertNotEqual(seqSeries, seqStudy) | |
| 940 self.assertNotEqual(seqStudy, seqPatient) | |
| 941 self.assertTrue(seqInstance < seqSeries) | |
| 942 self.assertTrue(seqSeries < seqStudy) | |
| 943 self.assertTrue(seqStudy < seqPatient) | |
| 944 e = DoGet(_REMOTE, '/exports?limit=1&since=0') | |
| 945 self.assertEqual(1, len(e['Exports'])) | |
| 946 self.assertFalse(e['Done']) | |
| 947 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance) | |
| 948 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance)) | |
| 949 self.assertEqual(1, len(e['Exports'])) | |
| 950 self.assertFalse(e['Done']) | |
| 951 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 952 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqSeries)) | |
| 953 self.assertEqual(1, len(e['Exports'])) | |
| 954 self.assertFalse(e['Done']) | |
| 955 self.assertEqual(e['Exports'][-1]['Seq'], seqStudy) | |
| 956 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqStudy)) | |
| 957 self.assertEqual(1, len(e['Exports'])) | |
| 958 self.assertTrue(e['Done']) | |
| 959 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient) | |
| 960 e = DoGet(_REMOTE, '/exports?last') | |
| 961 self.assertEqual(1, len(e['Exports'])) | |
| 962 self.assertTrue(e['Done']) | |
| 963 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient) | |
| 964 | |
| 965 | |
| 966 # Check the content of the logged information | |
| 967 e = DoGet(_REMOTE, '/exports')['Exports'] | |
| 968 | |
| 969 if 'PatientID' in e[0]: | |
| 970 # Since Orthanc 0.8.6 | |
| 971 patient = 'PatientID' | |
| 972 study = 'StudyInstanceUID' | |
| 973 series = 'SeriesInstanceUID' | |
| 974 instance = 'SOPInstanceUID' | |
| 975 else: | |
| 976 # Up to Orthanc 0.8.5 | |
| 977 patient = 'PatientId' | |
| 978 study = 'StudyInstanceUid' | |
| 979 series = 'SeriesInstanceUid' | |
| 980 instance = 'SopInstanceUid' | |
| 981 | |
| 982 for k in range(4): | |
| 983 self.assertTrue('Date' in e[k]) | |
| 984 self.assertTrue('Seq' in e[k]) | |
| 985 self.assertEqual('orthanctest', e[k]['RemoteModality']) | |
| 986 | |
| 987 self.assertEqual(10, len(e[0])) | |
| 988 self.assertEqual('Instance', e[0]['ResourceType']) | |
| 989 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['ID']) | |
| 990 self.assertEqual('/instances/66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['Path']) | |
| 991 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', e[0][instance]) | |
| 992 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', e[0][series]) | |
| 993 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[0][study]) | |
| 994 self.assertEqual('ozp00SjY2xG', e[0][patient]) | |
| 995 | |
| 996 self.assertEqual(9, len(e[1])) | |
| 997 self.assertEqual('Series', e[1]['ResourceType']) | |
| 998 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['ID']) | |
| 999 self.assertEqual('/series/f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['Path']) | |
| 1000 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', e[1][series]) | |
| 1001 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[1][study]) | |
| 1002 self.assertEqual('ozp00SjY2xG', e[1][patient]) | |
| 1003 | |
| 1004 self.assertEqual(8, len(e[2])) | |
| 1005 self.assertEqual('Study', e[2]['ResourceType']) | |
| 1006 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['ID']) | |
| 1007 self.assertEqual('/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['Path']) | |
| 1008 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[2][study]) | |
| 1009 self.assertEqual('ozp00SjY2xG', e[2][patient]) | |
| 1010 | |
| 1011 self.assertEqual(7, len(e[3])) | |
| 1012 self.assertEqual('Patient', e[3]['ResourceType']) | |
| 1013 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['ID']) | |
| 1014 self.assertEqual('/patients/6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['Path']) | |
| 1015 self.assertEqual('ozp00SjY2xG', e[3][patient]) | |
| 1016 | |
| 1017 DropOrthanc(_REMOTE) | |
| 1018 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 1019 | |
| 1020 | |
| 1021 def test_store_peer(self): | |
| 1022 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports'])) | |
| 1023 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 1024 | |
| 1025 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1026 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 1027 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1028 | |
| 1029 j = DoPost(_REMOTE, '/peers/peer/store', str(i), 'text/plain') | |
| 1030 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 1031 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1032 | |
| 1033 self.assertEqual(1, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 1034 | |
| 1035 DropOrthanc(_REMOTE) | |
| 1036 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 1037 | |
| 1038 | |
| 1039 def test_bulk_storescu(self): | |
| 1040 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 1041 | |
| 1042 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1043 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 1044 | |
| 1045 j = DoPost(_REMOTE, '/modalities/orthanctest/store', [ a['ID'], b['ID'] ], 'application/json') | |
| 1046 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) | |
| 1047 | |
| 1048 DropOrthanc(_LOCAL) | |
| 1049 | |
| 1050 # Send using patient's UUID | |
| 1051 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 1052 j = DoPost(_REMOTE, '/modalities/orthanctest/store', | |
| 1053 [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ], 'application/json') | |
| 1054 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) | |
| 1055 | |
| 1056 | |
| 1057 def test_color(self): | |
| 1058 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID'] | |
| 1059 im = GetImage(_REMOTE, '/instances/%s/preview' % i) | |
| 1060 self.assertEqual("RGB", im.mode) | |
| 1061 self.assertEqual(41, im.size[0]) | |
| 1062 self.assertEqual(41, im.size[1]) | |
| 1063 | |
| 1064 # http://effbot.org/zone/pil-comparing-images.htm | |
| 13 | 1065 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png')) |
| 11 | 1066 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None) |
| 1067 | |
| 1068 | |
| 12 | 1069 def test_faking_ruby_put(self): |
| 1070 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1071 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 1072 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 1073 a = DoGet(_REMOTE, '/patients')[0] | |
| 1074 b = DoGet(_REMOTE, '/patients')[1] | |
| 1075 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1076 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0') | |
| 1077 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1078 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '1') | |
| 1079 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1080 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0') | |
| 1081 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1082 | |
| 1083 | |
| 1084 def test_faking_ruby_delete(self): | |
| 1085 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1086 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 1087 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 1088 a = DoGet(_REMOTE, '/patients')[0] | |
| 1089 b = DoGet(_REMOTE, '/patients')[1] | |
| 1090 DoGet(_REMOTE, '/patients/%s' % a, data = { '_method' : 'DELETE' }) | |
| 1091 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1092 DoGet(_REMOTE, '/patients/%s' % b, data = { '_method' : 'DELETE' }) | |
| 1093 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 1094 | |
| 1095 | |
| 1096 def test_faking_google_put(self): | |
| 1097 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1098 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 1099 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 1100 a = DoGet(_REMOTE, '/patients')[0] | |
| 1101 b = DoGet(_REMOTE, '/patients')[1] | |
| 1102 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1103 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '0') | |
| 1104 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1105 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '1') | |
| 1106 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1107 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '0') | |
| 1108 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1109 | |
| 1110 | |
| 1111 def test_faking_google_delete(self): | |
| 1112 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1113 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 1114 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 1115 a = DoGet(_REMOTE, '/patients')[0] | |
| 1116 b = DoGet(_REMOTE, '/patients')[1] | |
| 1117 DoPost(_REMOTE, '/patients/%s' % a, headers = { 'X-HTTP-Method-Override' : 'DELETE' }) | |
| 1118 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1119 DoPost(_REMOTE, '/patients/%s' % b, headers = { 'X-HTTP-Method-Override' : 'DELETE' }) | |
| 1120 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 1121 | |
| 1122 | |
| 1123 def test_lua(self): | |
| 1124 self.assertEqual(42, DoPost(_REMOTE, '/tools/execute-script', 'print(42)')) | |
| 1125 self.assertTrue(IsDefinedInLua(_REMOTE, 'PrintRecursive')) | |
| 1126 self.assertFalse(IsDefinedInLua(_REMOTE, 'HelloWorld')) | |
| 1127 | |
| 1128 | |
| 1129 def test_metadata(self): | |
| 1130 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1131 p = DoGet(_REMOTE, '/patients')[0] | |
| 1132 i = DoGet(_REMOTE, '/instances')[0] | |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1133 series = DoGet(_REMOTE, '/series')[0] |
| 12 | 1134 |
| 1135 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) | |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1136 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1137 self.assertEqual(2, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1138 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1139 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1140 self.assertEqual(1, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1141 self.assertTrue('LastUpdate' in m) |
| 12 | 1142 |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1143 # 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
|
1144 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
|
1145 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
|
1146 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
|
1147 |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1148 m = DoGet(_REMOTE, '/studies/%s/metadata' % DoGet(_REMOTE, '/studies')[0]) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1149 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1150 self.assertEqual(2, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1151 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1152 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1153 self.assertEqual(1, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1154 self.assertTrue('LastUpdate' in m) |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1155 |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1156 m = DoGet(_REMOTE, '/series/%s/metadata' % series) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1157 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1158 self.assertEqual(3, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1159 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1160 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1161 self.assertEqual(2, len(m)) |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1162 self.assertTrue('LastUpdate' in m) |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1163 |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1164 # New in Orthanc 1.9.0 |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1165 self.assertTrue('RemoteAET' in m) |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1166 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
|
1167 |
| 12 | 1168 m = DoGet(_REMOTE, '/instances/%s/metadata' % i) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1169 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1170 self.assertEqual(10, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1171 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1172 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1173 self.assertEqual(9, len(m)) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1174 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
|
1175 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
|
1176 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1177 self.assertEqual(8, len(m)) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1178 |
| 12 | 1179 self.assertTrue('IndexInSeries' in m) |
| 1180 self.assertTrue('ReceptionDate' in m) | |
| 1181 self.assertTrue('RemoteAET' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1182 self.assertTrue('Origin' in m) |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
1183 self.assertTrue('TransferSyntax' in m) |
|
95
a807a4699eb4
testing of metadata SopClassUid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
1184 self.assertTrue('SopClassUid' in m) |
| 145 | 1185 self.assertTrue('RemoteIP' in m) |
| 1186 self.assertTrue('HttpUsername' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1187 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
|
1188 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
|
1189 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
|
1190 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
|
1191 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i), '1.2.840.10008.5.1.4.1.1.4') |
| 12 | 1192 |
| 1193 # Play with custom metadata | |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1194 (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
|
1195 self.assertEqual('200', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1196 self.assertEqual('', body) |
|
394
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1197 |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1198 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
|
1199 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
|
1200 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1201 self.assertFalse('ETag' in headers) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1202 self.assertFalse('etag' in headers) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1203 |
| 12 | 1204 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1205 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1206 self.assertEqual(3, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1207 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1208 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1209 self.assertEqual(2, len(m)) |
| 12 | 1210 self.assertTrue('LastUpdate' in m) |
| 1211 self.assertTrue('5555' in m) | |
| 1212 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
|
1213 |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1214 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2): |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1215 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
|
1216 'If-Match' : headers['etag'] |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1217 }) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1218 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1219 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'hello') |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1220 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1221 (headers, body) = DoGetRaw(_REMOTE, '/patients/%s/metadata/5555' % p) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1222 self.assertEqual('200', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1223 self.assertEqual('hello', body) |
|
394
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1224 |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1225 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2): |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1226 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p, headers = { |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1227 'If-Match' : headers['etag'] |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1228 }) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1229 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1230 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1231 |
| 12 | 1232 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1233 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1234 self.assertEqual(2, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1235 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1236 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1237 self.assertEqual(1, len(m)) |
| 12 | 1238 self.assertTrue('LastUpdate' in m) |
| 13 | 1239 |
| 1240 | |
| 1241 def test_statistics(self): | |
| 1242 # Upload 16 instances | |
| 1243 for i in range(4): | |
| 1244 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 1245 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 1246 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 1247 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 1248 | |
| 1249 s = DoGet(_REMOTE, '/statistics') | |
| 1250 self.assertEqual(16, s['CountInstances']) | |
| 1251 self.assertEqual(2, s['CountPatients']) | |
| 1252 self.assertEqual(2, s['CountStudies']) | |
| 1253 self.assertEqual(4, s['CountSeries']) | |
| 1254 d = int(s['TotalUncompressedSize']) | |
| 1255 | |
| 1256 e = 0 | |
| 1257 for patient in DoGet(_REMOTE, '/patients'): | |
| 1258 s = DoGet(_REMOTE, '/patients/%s/statistics' % patient) | |
| 1259 self.assertEqual(8, s['CountInstances']) | |
| 1260 self.assertEqual(1, s['CountStudies']) | |
| 1261 self.assertEqual(2, s['CountSeries']) | |
| 1262 e += int(s['UncompressedSize']) | |
| 1263 | |
| 1264 for study in DoGet(_REMOTE, '/studies'): | |
| 1265 s = DoGet(_REMOTE, '/studies/%s/statistics' % study) | |
| 1266 self.assertEqual(8, s['CountInstances']) | |
| 1267 self.assertEqual(2, s['CountSeries']) | |
| 1268 e += int(s['UncompressedSize']) | |
| 1269 | |
| 1270 for series in DoGet(_REMOTE, '/series'): | |
| 1271 s = DoGet(_REMOTE, '/series/%s/statistics' % series) | |
| 1272 self.assertEqual(4, s['CountInstances']) | |
| 1273 e += int(s['UncompressedSize']) | |
| 1274 | |
| 1275 self.assertEqual(3 * d, e) | |
| 1276 | |
| 1277 | |
| 1278 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
|
1279 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
|
1280 |
| 13 | 1281 patient = DoGet(_REMOTE, '/patients')[0] |
| 1282 instance = DoGet(_REMOTE, '/instances')[0] | |
| 1283 size = int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']) | |
| 1284 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1285 | |
| 1286 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) | |
| 1287 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
|
1288 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1289 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
|
1290 if IsDicomUntilPixelDataStored(_REMOTE): |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1291 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
|
1292 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
|
1293 |
|
448
63f475995400
Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
447
diff
changeset
|
1294 # New in Orthanc 1.10.0 |
|
443
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1295 a = DoGet(_REMOTE, '/instances/%s/attachments?full' % instance) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1296 self.assertEqual(2, len(a)) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1297 self.assertEqual(1, a['dicom']) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1298 self.assertEqual(3, a['dicom-until-pixel-data']) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1299 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1300 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1301 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
|
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(1, len(a)) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1306 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
|
1307 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1308 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
|
1309 self.assertTrue('dicom-as-json' in DoGet(_REMOTE, '/instances/%s/attachments' % instance)) |
| 13 | 1310 |
|
448
63f475995400
Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
447
diff
changeset
|
1311 # New in Orthanc 1.10.0 |
|
443
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1312 self.assertRaises(Exception, lambda: DoGet( |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1313 _REMOTE, '/instances/%s/attachments?full' % instance)) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1314 |
| 13 | 1315 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/patients/%s/attachments/22' % patient, 'hello')) |
| 1316 hello = 'hellohellohellohellohellohellohellohellohello' | |
| 1317 DoPut(_REMOTE, '/patients/%s/attachments/1025' % patient, hello) | |
| 1318 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1319 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1320 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1321 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient))) | |
| 1322 | |
| 1323 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world') | |
| 1324 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1325 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1326 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1327 size + | |
| 1328 int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient)) + | |
| 1329 int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient))) | |
| 1330 | |
| 1331 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) | |
| 1332 self.assertEqual(hello, DoGet(_REMOTE, '/patients/%s/attachments/1025/data' % patient)) | |
| 1333 self.assertEqual('world', DoGet(_REMOTE, '/patients/%s/attachments/1026/data' % patient)) | |
| 1334 DoPost(_REMOTE, '/patients/%s/attachments/1025/verify-md5' % patient) | |
| 1335 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
|
1336 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
|
1337 'If-Match' : '0-%s' % ComputeMD5('world'), |
|
392
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
1338 }) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
1339 |
|
394
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1340 (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
|
1341 self.assertEqual('200', headers['status']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
1342 self.assertEqual('world2', body) |
| 13 | 1343 |
| 1344 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
|
1345 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
|
1346 'If-Match' : '0-%s' % ComputeMD5(hello), |
|
392
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
1347 }) |
| 13 | 1348 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), |
| 1349 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1350 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1351 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient))) | |
| 1352 | |
| 1353 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
|
1354 |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1355 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2): |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1356 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient, headers = { |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1357 'If-Match' : headers['etag'] |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1358 }) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1359 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1360 self.assertFalse('etag' in headers) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1361 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1362 |
| 13 | 1363 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) |
| 1364 | |
| 1365 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), size) | |
| 1366 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1367 | |
| 1368 | |
| 1369 def test_incoming_storescu(self): | |
| 1370 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 45 | 1371 subprocess.check_call([ FindExecutable('storescu'), |
|
44
ffa542cce638
Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
1372 _REMOTE['Server'], str(_REMOTE['DicomPort']), |
| 13 | 1373 GetDatabasePath('ColorTestImageJ.dcm') ]) |
| 1374 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1375 | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1376 i = DoGet(_REMOTE, '/instances') |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1377 self.assertEqual(1, len(i)) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1378 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
|
1379 |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1380 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1381 self.assertEqual(10, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1382 self.assertTrue('MainDicomTagsSignature' in m) # New in Orthanc 1.11.0 |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1383 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1384 self.assertEqual(9, len(m)) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1385 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
|
1386 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1387 self.assertEqual(8, len(m)) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1388 |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1389 self.assertTrue('IndexInSeries' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1390 self.assertTrue('ReceptionDate' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1391 self.assertTrue('RemoteAET' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1392 self.assertTrue('Origin' in m) |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
1393 self.assertTrue('TransferSyntax' in m) |
|
95
a807a4699eb4
testing of metadata SopClassUid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
1394 self.assertTrue('SopClassUid' in m) |
| 145 | 1395 self.assertTrue('RemoteIP' in m) |
| 1396 self.assertTrue('CalledAET' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1397 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
|
1398 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
|
1399 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
|
1400 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
|
1401 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
|
1402 |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1403 series = DoGet(_REMOTE, '/series')[0] |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1404 m = DoGet(_REMOTE, '/series/%s/metadata' % series) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1405 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1406 self.assertEqual(3, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1407 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1408 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1409 self.assertEqual(2, len(m)) |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1410 self.assertTrue('LastUpdate' in m) |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1411 self.assertTrue('RemoteAET' in m) |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1412 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
|
1413 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
|
1414 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
|
1415 |
| 13 | 1416 |
| 1417 def test_incoming_findscu(self): | |
| 1418 UploadInstance(_REMOTE, 'Multiframe.dcm') | |
| 1419 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') | |
| 1420 | |
| 1421 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', '0010,0010' ]) | |
| 1422 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) | |
| 1423 self.assertEqual(2, len(patientNames)) | |
| 1424 self.assertTrue('Test Patient BG ' in patientNames) | |
| 1425 self.assertTrue('Anonymized' in patientNames) | |
| 1426 | |
| 1427 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,0021' ]) | |
| 1428 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i) | |
| 1429 self.assertEqual(2, len(series)) | |
| 1430 self.assertTrue('20070208' in series) | |
| 1431 self.assertTrue('19980312' in series) | |
| 1432 | |
|
335
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
1433 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
|
1434 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1435 self.assertEqual(1, len(series)) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1436 self.assertTrue('19980312' in series) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1437 |
| 13 | 1438 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=Anonymized' ]) |
| 1439 series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i) | |
| 1440 self.assertEqual(1, len(series)) | |
| 1441 | |
| 1442 # Test the "CaseSentitivePN" flag (false by default) | |
| 1443 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=anonymized' ]) | |
| 1444 series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i) | |
| 1445 self.assertEqual(1, len(series)) | |
|
66
821d9eb73c45
Test returning sequence values
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
1446 |
| 70 | 1447 # Test range search (buggy if Orthanc <= 0.9.6) |
| 1448 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-' ]) | |
| 1449 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1450 self.assertEqual(2, len(studies)) | |
| 1451 self.assertTrue('20070208' in studies) | |
| 1452 self.assertTrue('19980312' in studies) | |
| 1453 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-19980312' ]) | |
| 1454 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1455 self.assertEqual(1, len(studies)) | |
| 1456 self.assertTrue('19980312' in studies) | |
| 1457 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=-19980312' ]) | |
| 1458 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1459 self.assertEqual(1, len(studies)) | |
| 1460 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
|
1461 |
|
05f48c19c60d
Test "Retrieve AE Title" is returned by C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
324
diff
changeset
|
1462 # 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
|
1463 # 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
|
1464 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
|
1465 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
|
1466 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
|
1467 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
|
1468 self.assertEqual('ORTHANC', instances[1].strip()) |
| 13 | 1469 |
| 1470 | |
|
191
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1471 def test_incoming_findscu_2(self): |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1472 # This test fails if "LookupMode_DatabaseOnly" is used |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1473 # (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
|
1474 # DICOM tags are returned) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1475 UploadInstance(_REMOTE, 'Multiframe.dcm') |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1476 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1477 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1478 # 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
|
1479 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
|
1480 sequences = re.findall('\(0008,2112\)', i) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1481 self.assertEqual(1, len(sequences)) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1482 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1483 # Test returning a non-main DICOM tag, |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1484 # "SecondaryCaptureDeviceID" (0018,1010), whose value is |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1485 # "MEDPC" in "ColorTestImageJ.dcm" |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1486 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0018,1010' ]) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1487 tags = re.findall('\(0018,1010\).*MEDPC', i) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1488 self.assertEqual(1, len(tags)) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1489 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1490 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1491 def test_incoming_findscu_3(self): |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1492 # This test fails if "LookupMode_DatabaseOnly" or |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1493 # "LookupMode_DiskOnAnswer" is used, as |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1494 # "SecondaryCaptureDeviceID" (0018,1010) is not a main DICOM |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1495 # 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
|
1496 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1497 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1498 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
|
1499 sequences = re.findall('\(0018,1010\)', i) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1500 self.assertEqual(1, len(sequences)) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1501 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1502 |
| 13 | 1503 def test_incoming_movescu(self): |
| 1504 UploadInstance(_REMOTE, 'Multiframe.dcm') | |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1505 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1506 # No matching patient, so no job is created |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1507 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1508 CallMoveScu([ '--patient', '-k', '0008,0052=PATIENT', '-k', 'PatientID=none' ]) |
| 13 | 1509 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1510 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1511 # 1 Matching patient, track the job |
| 138 | 1512 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
| 1513 '--patient', | |
| 1514 '-k', '0008,0052=PATIENT', | |
| 1515 '-k', 'PatientID=12345678' | |
| 1516 ]))) | |
| 13 | 1517 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) |
| 1518 | |
| 1519 | |
| 1520 def test_findscu(self): | |
| 1521 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1522 j = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] | |
| 1523 k = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] | |
| 1524 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 1525 | |
| 1526 # Test the "find-patient" level | |
| 1527 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }) | |
| 1528 self.assertEqual(1, len(p)) | |
| 1529 self.assertEqual('ozp00SjY2xG', p[0]['PatientID']) | |
| 1530 | |
| 1531 # Test wildcards constraints. The "LO" value representation | |
| 1532 # for PatientID is always case-sensitive, but the "PN" for | |
| 1533 # PatientName might depend on the implementation: | |
| 1534 # "GenerateConfigurationForTests.py" will force it to be case | |
| 1535 # insensitive (which was the default until Orthanc 0.8.6). | |
| 1536 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'K*' }) | |
| 1537 self.assertEqual(1, len(p)) | |
| 1538 | |
| 1539 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'k*' }) | |
| 1540 self.assertEqual(1, len(p)) | |
| 1541 | |
| 1542 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'ozp*' }) | |
| 1543 self.assertEqual(1, len(p)) | |
| 1544 | |
| 1545 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'o?p*' }) | |
| 1546 self.assertEqual(1, len(p)) | |
| 1547 | |
| 1548 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : '0?q*' }) | |
| 1549 self.assertEqual(0, len(p)) | |
| 1550 | |
| 1551 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'B*' }) | |
| 1552 self.assertEqual(0, len(p)) | |
| 1553 | |
| 1554 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'b*' }) | |
| 1555 self.assertEqual(0, len(p)) | |
| 1556 | |
| 1557 DoPost(_REMOTE, '/modalities/orthanctest/store', str(j), 'text/plain') | |
| 1558 DoPost(_REMOTE, '/modalities/orthanctest/store', str(k), 'text/plain') | |
| 1559 DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }) | |
| 1560 self.assertEqual(3, len(DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }))) | |
| 1561 | |
| 1562 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'A*' }) | |
| 1563 self.assertEqual(2, len(p)) | |
| 1564 | |
| 1565 # Test the "find-study" level. This is the instance "ColorTestImageJ.dcm" | |
| 1566 s = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ' }) | |
| 1567 self.assertEqual(1, len(s)) | |
| 1568 self.assertEqual('20070208', s[0]['StudyDate']) | |
| 1569 | |
| 1570 # Test range searches | |
| 1571 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1572 'StudyDate' : '-20070101' }) | |
| 1573 self.assertEqual(0, len(t)) | |
| 1574 | |
| 1575 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1576 'StudyDate' : '20090101-' }) | |
| 1577 self.assertEqual(0, len(t)) | |
| 1578 | |
| 1579 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1580 'StudyDate' : '20070101-' }) | |
| 1581 self.assertEqual(1, len(t)) | |
| 1582 | |
| 1583 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1584 'StudyDate' : '-20090101' }) | |
| 1585 self.assertEqual(1, len(t)) | |
| 1586 | |
| 1587 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1588 'StudyDate' : '20070207-20070207' }) | |
| 1589 self.assertEqual(0, len(t)) | |
| 1590 | |
| 1591 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1592 'StudyDate' : '20070208-20070208' }) | |
| 1593 self.assertEqual(1, len(t)) | |
| 1594 | |
| 1595 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1596 'StudyDate' : '20070209-20070209' }) | |
| 1597 self.assertEqual(0, len(t)) | |
| 1598 | |
| 1599 # Test the ModalitiesInStudy tag | |
| 1600 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1601 'PatientID' : 'B9uTHKOZ', | |
| 1602 'ModalitiesInStudy' : 'US' }) | |
| 1603 self.assertEqual(0, len(t)) | |
| 1604 | |
| 1605 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1606 'PatientID' : 'B9uTHKOZ', | |
| 1607 'ModalitiesInStudy' : 'CT' }) | |
| 1608 self.assertEqual(1, len(t)) | |
| 1609 | |
| 1610 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1611 'PatientID' : 'B9uTHKOZ', | |
| 1612 'ModalitiesInStudy' : 'US\\CT' }) | |
| 1613 self.assertEqual(1, len(t)) | |
| 1614 | |
|
466
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1615 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { |
|
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1616 'PatientID' : 'B9uTHKOZ', |
|
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1617 'ModalitiesInStudy' : '' }) |
|
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1618 self.assertEqual(1, len(t)) |
|
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1619 |
| 13 | 1620 # Test the "find-series" level |
| 1621 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1622 'PatientID' : 'B9uTHKOZ', | |
| 1623 'StudyInstanceUID' : s[0]['StudyInstanceUID'] }) | |
| 1624 self.assertEqual(1, len(t)) | |
| 1625 | |
| 1626 # Test "\" separator | |
| 1627 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1628 'PatientID' : 'B9uTHKOZ', | |
| 1629 'StudyInstanceUID' : s[0]['StudyInstanceUID'], | |
| 1630 'Modality' : 'MR\\CT\\US' }) | |
| 1631 self.assertEqual(1, len(t)) | |
| 1632 | |
| 1633 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1634 'PatientID' : 'B9uTHKOZ', | |
| 1635 'StudyInstanceUID' : s[0]['StudyInstanceUID'], | |
| 1636 'Modality' : 'MR\\US' }) | |
| 1637 self.assertEqual(0, len(t)) | |
| 1638 | |
| 1639 | |
| 1640 def test_update_modalities(self): | |
| 1641 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
|
1642 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/modalities/toto')) |
| 13 | 1643 DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000 ]) |
| 116 | 1644 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'MedInria' ]) # check backward compatiblity with obsolete manufacturer |
| 1645 DoDelete(_REMOTE, '/modalities/tata') | |
| 124 | 1646 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoUniversalWildcard' ]) |
|
121
1a19f953f53c
also test GenericNoWildcardInDates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
120
diff
changeset
|
1647 DoDelete(_REMOTE, '/modalities/tata') |
|
1a19f953f53c
also test GenericNoWildcardInDates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
120
diff
changeset
|
1648 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoWildcardInDates' ]) |
| 128 | 1649 modalitiesReadback = DoGet(_REMOTE, '/modalities?expand') |
|
182
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1650 self.assertEqual('STORESCP', modalitiesReadback['tata']['AET']) |
|
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1651 self.assertEqual('localhost', modalitiesReadback['tata']['Host']) |
|
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1652 self.assertEqual(2000, modalitiesReadback['tata']['Port']) |
|
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1653 self.assertEqual('GenericNoWildcardInDates', modalitiesReadback['tata']['Manufacturer']) |
| 116 | 1654 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000, 'InvalidManufacturerName' ])) |
| 13 | 1655 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/toto')) |
| 1656 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
|
1657 |
|
429cc9d03610
test access to the configuration of one single peer or modality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
350
diff
changeset
|
1658 # 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
|
1659 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
|
1660 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
|
1661 |
| 13 | 1662 DoDelete(_REMOTE, '/modalities/toto') |
| 1663 DoDelete(_REMOTE, '/modalities/tata') | |
| 1664 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto')) | |
| 1665 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/tata')) | |
| 1666 | |
| 1667 | |
| 1668 def test_update_peers(self): | |
| 1669 # curl -X PUT http://localhost:8042/peers/toto -d '["http://localhost:8042/"]' -v | |
| 1670 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
|
1671 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/peers/toto')) |
| 13 | 1672 DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/' ]) |
| 214 | 1673 DoPut(_REMOTE, '/peers/tata', { 'Url': 'http://localhost:8042/', |
| 1674 'Username': 'user', | |
| 1675 'Password' : 'pass', | |
| 1676 'RemoteSelf' : 'self' }) | |
| 128 | 1677 self.assertTrue('tata' in DoGet(_REMOTE, '/peers')) |
| 1678 peersReadback = DoGet(_REMOTE, '/peers?expand') | |
| 1679 self.assertEqual('http://localhost:8042/', peersReadback['tata']['Url']) | |
| 1680 self.assertEqual('user', peersReadback['tata']['Username']) | |
| 214 | 1681 |
| 1682 if IsOrthancVersionAbove(_REMOTE, 1, 5, 4): | |
| 1683 self.assertEqual(None, peersReadback['tata']['Password']) # make sure no sensitive data is included | |
| 1684 self.assertFalse(peersReadback['tata']['Pkcs11']) # make sure no sensitive data is included | |
| 1685 self.assertEqual('self', peersReadback['tata']['RemoteSelf']) | |
| 1686 else: | |
| 1687 self.assertFalse('Password' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1688 self.assertFalse('Pkcs11' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1689 self.assertFalse('RemoteSelf' in peersReadback['tata']) | |
| 1690 | |
| 128 | 1691 self.assertFalse('CertificateFile' in peersReadback['tata']) # make sure no sensitive data is included |
| 1692 self.assertFalse('CertificateKeyFile' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1693 self.assertFalse('CertificateKeyPassword' in peersReadback['tata']) # make sure no sensitive data is included | |
| 214 | 1694 |
| 13 | 1695 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a' ])) |
| 1696 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a', 'b', 'c' ])) | |
| 1697 self.assertTrue('store' in DoGet(_REMOTE, '/peers/toto')) | |
| 1698 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
|
1699 |
|
429cc9d03610
test access to the configuration of one single peer or modality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
350
diff
changeset
|
1700 # 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
|
1701 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
|
1702 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
|
1703 |
| 13 | 1704 DoDelete(_REMOTE, '/peers/toto') |
| 1705 DoDelete(_REMOTE, '/peers/tata') | |
| 1706 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto')) | |
| 1707 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/tata')) | |
| 1708 | |
| 1709 | |
| 1710 def test_mesterhazy_modification(self): | |
| 1711 # When I modify a series ( eg. curl | |
| 1712 # http://localhost:8042/series/uidhere/modify -X POST -d | |
| 1713 # '{"Replace":{"SeriesDate":"19990101"}}' ) the modified | |
| 1714 # series is added to a new Study, instead of the existing | |
| 1715 # Study. Fixed in Orthanc 0.7.5 | |
| 1716 | |
| 1717 u = UploadInstance(_REMOTE, 'DummyCT.dcm') | |
| 1718 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' | |
| 1719 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 1720 | |
| 1721 modified = DoPost(_REMOTE, '/series/%s/modify' % series, | |
| 1722 json.dumps({ "Replace" : { "SeriesDate" : "19990101" }})) | |
| 1723 | |
| 1724 self.assertEqual(study, DoGet(_REMOTE, '/series/%s' % modified['ID']) ['ParentStudy']) | |
| 1725 | |
| 1726 | |
| 1727 def test_create(self): | |
| 1728 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 1729 json.dumps({ | |
| 1730 'PatientName' : 'Jodogne', | |
| 1731 'Modality' : 'CT', | |
| 58 | 1732 'SOPClassUID' : '1.2.840.10008.5.1.4.1.1.1', |
| 13 | 1733 'PixelData' : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==' # red dot in RGBA |
| 1734 })) | |
| 1735 | |
| 1736 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 1737 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip()) | |
| 1738 | |
| 1739 png = GetImage(_REMOTE, '/instances/%s/preview' % i['ID']) | |
| 1740 self.assertEqual((5, 5), png.size) | |
| 1741 | |
| 38 | 1742 j = DoGet(_REMOTE, i['Path']) |
| 1743 self.assertEqual('Instance', j['Type']) | |
| 1744 self.assertEqual(j['ID'], i['ID']) | |
| 1745 | |
| 13 | 1746 |
| 1747 def test_pilates(self): | |
| 1748 # "SCU failed error when accessing orthanc with osirix" by | |
| 1749 # Pilates Agentur (Mar 10, 2014 at 9:33 PM) | |
| 1750 i = UploadInstance(_REMOTE, 'PilatesArgenturGEUltrasoundOsiriX.dcm')['ID'] | |
| 1751 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 1752 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 1753 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 1754 | |
| 1755 | |
| 1756 def test_shared_tags(self): | |
| 1757 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1758 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')['ID'] | |
| 1759 p = DoGet(_REMOTE, '/patients')[0] | |
| 1760 | |
| 1761 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1762 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
|
1763 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
|
1764 |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
1765 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
|
1766 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
|
1767 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
|
1768 |
| 13 | 1769 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) |
| 1770 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1771 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1772 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1773 self.assertFalse('0008,0018' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1774 self.assertFalse('SOPInstanceUID' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1775 | |
| 1776 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/tags' % a)) | |
| 1777 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/tags?simplify' % a)) | |
| 1778 | |
| 1779 | |
| 1780 def test_modules(self): | |
| 1781 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1782 p = DoGet(_REMOTE, '/patients')[0] | |
| 1783 s = DoGet(_REMOTE, '/studies')[0] | |
| 1784 t = DoGet(_REMOTE, '/series')[0] | |
| 1785 | |
| 1786 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/module' % p)) | |
| 1787 self.assertTrue('PatientName' in DoGet(_REMOTE, '/patients/%s/module?simplify' % p)) | |
| 1788 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/studies/%s/module-patient' % p)) | |
| 1789 self.assertTrue('PatientName' in DoGet(_REMOTE, '/studies/%s/module-patient?simplify' % p)) | |
| 1790 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/studies/%s/module' % s)) | |
| 1791 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/studies/%s/module?simplify' % s)) | |
| 1792 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/series/%s/module' % p)) | |
| 1793 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/series/%s/module?simplify' % p)) | |
| 1794 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/module' % a)) | |
| 1795 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/module?simplify' % a)) | |
| 1796 | |
| 1797 | |
| 1798 def test_auto_directory(self): | |
| 1799 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1800 self.assertTrue('now' in DoGet(_REMOTE, '/tools')) | |
| 1801 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
|
1802 self.assertTrue('invalidate-tags' in DoGet(_REMOTE, '/tools')) |
| 13 | 1803 self.assertTrue(len(DoGet(_REMOTE, '/tools/dicom-conformance')) > 1000) |
| 1804 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities')) | |
| 1805 self.assertTrue('echo' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1806 self.assertTrue('find' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1807 self.assertTrue('find-instance' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1808 self.assertTrue('find-patient' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1809 self.assertTrue('find-series' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1810 self.assertTrue('find-study' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1811 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1812 self.assertTrue('store' in DoGet(_REMOTE, '/peers/peer')) | |
| 1813 self.assertTrue('matlab' in DoGet(_REMOTE, '/instances/%s/frames/0' % a)) | |
| 79 | 1814 self.assertTrue('raw' in DoGet(_REMOTE, '/instances/%s/frames/0' % a)) |
| 13 | 1815 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/tools/nope')) |
| 28 | 1816 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope')) |
| 1817 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope/nope.html')) | |
| 1818 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope')[0].status) | |
| 1819 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope/nope.html')[0].status) | |
| 13 | 1820 |
| 1821 | |
| 1822 def test_echo(self): | |
| 1823 DoPost(_REMOTE, '/modalities/orthanctest/echo') | |
|
359
8b476a383999
test empty body in /modalities/.../echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
357
diff
changeset
|
1824 DoPost(_REMOTE, '/modalities/orthanctest/echo', '{}') |
|
8b476a383999
test empty body in /modalities/.../echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
357
diff
changeset
|
1825 |
|
8b476a383999
test empty body in /modalities/.../echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
357
diff
changeset
|
1826 # 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
|
1827 DoPost(_REMOTE, '/modalities/orthanctest/echo', '') |
|
352
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
1828 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/nope/echo')) |
|
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
1829 |
|
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
1830 # New in Orthanc 1.8.1 |
|
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
1831 DoPost(_REMOTE, '/tools/dicom-echo', [ |
| 355 | 1832 _REMOTE['DicomAet'], _REMOTE['Server'], _REMOTE['DicomPort'] ]) |
|
352
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
1833 DoPost(_REMOTE, '/tools/dicom-echo', DoGet(_REMOTE, '/modalities/orthanctest/configuration')) |
| 13 | 1834 |
| 353 | 1835 # Use the 'CheckFind' new option in Orthanc 1.8.1 |
| 1836 DoPost(_REMOTE, '/modalities/self/echo', { 'CheckFind' : True }) | |
| 1837 DoPost(_REMOTE, '/tools/dicom-echo', { | |
| 1838 'AET' : _REMOTE['DicomAet'], | |
| 1839 'Host' : _REMOTE['Server'], | |
| 1840 'Port' : _REMOTE['DicomPort'], | |
| 1841 'CheckFind' : True | |
| 1842 }) | |
| 1843 | |
| 13 | 1844 |
| 1845 def test_xml(self): | |
| 1846 json = DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/json' }) | |
| 1847 xml = minidom.parseString(DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/xml' })) | |
| 1848 items = xml.getElementsByTagName('root')[0].getElementsByTagName('item') | |
| 1849 self.assertEqual(len(items), len(json)) | |
| 1850 | |
| 1851 self.assertTrue('dicom-conformance' in json) | |
| 1852 | |
| 1853 ok = False | |
| 1854 for i in items: | |
| 1855 if i.childNodes[0].data == 'dicom-conformance': | |
| 1856 ok = True | |
| 1857 self.assertTrue(ok) | |
| 1858 | |
| 1859 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1860 def test_googlecode_issue_16(self): |
| 13 | 1861 i = UploadInstance(_REMOTE, 'Issue16.dcm')['ID'] |
| 1862 t = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)['FrameIncrementPointer'] | |
| 1863 self.assertEqual('0018,1063', t) | |
| 1864 | |
| 1865 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1866 def test_googlecode_issue_22(self): |
| 13 | 1867 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] |
| 1868 a = [ | |
| 1869 "f804691f62197040438f4627c6b994f1", # Frame 0 | |
| 1870 "c69eee9a51eea3e8611e82e578897254", | |
| 1871 "315666be83e2d0111c77bc0996d84901", | |
| 1872 "3e27aa959d911172c48a1436443c72b1", | |
| 1873 "958642c9e7e9d232d3869faff546058c", | |
| 1874 "5e7ea8e3e4230cae707d143481355c59", | |
| 1875 "eda37f83558d858a596175aed8b2ad47", | |
| 1876 "486713bd2895c4ecbe0e97715ac7f80a", | |
| 1877 "091ef729eb169e67da8a0faa9631f9a8", | |
| 1878 "5aa2b8c7ffe0a483efaa8e12417686ca", | |
| 1879 "e2f39e85896fe58876654b94cd0b5013", | |
| 1880 "6fd2129e4950abbe1be053bc814d5da8", | |
| 1881 "c3331a8ba7a757f3d423735ab7fa81f9", | |
| 1882 "746f808582156734dd6b6fdfd3a0b72c", | |
| 1883 "8075ea2b227a70c60ea6b7b75a6bb190", | |
| 1884 "806b8b3e300c615099c11a5ec23465aa", | |
| 1885 "7c836aa298ba6eef96434579af631a11", | |
| 1886 "a0357dc9f4f72d73a885c33d7c287446", | |
| 1887 "f25ba3be1cc7d7fad95706adc199ea7d", | |
| 1888 "8b114c526b8cbed6cad8a3248b7b480c", | |
| 1889 "44e6670f127e612a2b4aa60a0d207698", | |
| 1890 "b8945f90fe02facf2ace24ca1ecbe0a5", | |
| 1891 "95c796c2fa8f59018b15cf2987b1f79b", | |
| 1892 "ce0a51ab30224205b44920221dc27351", # Frame 23 | |
| 1893 ] | |
| 1894 | |
| 1895 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 1896 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/preview' % s)) | |
| 1897 | |
| 1898 for i in range(len(a)): | |
| 1899 self.assertEqual(a[i], ComputeMD5(DoGet(_REMOTE, '/instances/%s/frames/%d/preview' % (s, i)))) | |
| 1900 | |
| 1901 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1902 def test_googlecode_issue_19(self): |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
1903 # This is an image with "YBR_FULL" photometric interpretation, it is not supported by Orthanc |
| 13 | 1904 # gdcmconv -i /home/jodogne/DICOM/GdcmDatabase/US_DataSet/HDI5000_US/3EAF5E01 -w -o Issue19.dcm |
| 1905 | |
| 1906 a = UploadInstance(_REMOTE, 'Issue19.dcm')['ID'] | |
| 304 | 1907 if not HasGdcmPlugin(_REMOTE): |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
1908 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/941ad3c8-05d05b88-560459f9-0eae0e20-6cddd533/preview')) |
| 13 | 1909 |
| 1910 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1911 def test_googlecode_issue_37(self): |
| 13 | 1912 # Same test for issues 35 and 37. Fixed in Orthanc 0.9.1 |
| 1913 u = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID'] | |
| 1914 | |
| 1915 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 1916 'CaseSensitive' : True, | |
| 1917 'Query' : { 'StationName' : 'SMR4-MP3' }}) | |
| 1918 self.assertEqual(1, len(a)) | |
| 14 | 1919 |
| 1920 | |
| 1921 def test_rest_find(self): | |
| 1922 # Upload 8 instances | |
| 1923 for i in range(2): | |
| 1924 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 1925 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 1926 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 1927 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 1928 | |
| 1929 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 1930 'CaseSensitive' : False, | |
|
194
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1931 'Query' : { 'PatientName' : 'BRAINIX' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1932 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1933 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1934 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1935 'CaseSensitive' : False, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1936 'Query' : { 'PatientName' : 'BRAINIX\\KNEE\\NOPE' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1937 self.assertEqual(2, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1938 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1939 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1940 'CaseSensitive' : False, |
| 14 | 1941 'Query' : { 'PatientName' : '*n*' }}) |
| 1942 self.assertEqual(2, len(a)) | |
| 1943 | |
| 1944 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 1945 'CaseSensitive' : True, | |
| 1946 'Query' : { 'PatientName' : '*n*' }}) | |
| 1947 self.assertEqual(0, len(a)) | |
| 1948 | |
| 1949 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True, | |
| 1950 'Level' : 'Patient', | |
| 1951 'CaseSensitive' : False, | |
| 1952 'Query' : { 'PatientName' : '*ne*' }}) | |
| 1953 self.assertEqual(1, len(a)) | |
| 1954 self.assertEqual('20080822', a[0]['MainDicomTags']['PatientBirthDate']) | |
| 1955 | |
| 1956 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 1957 'CaseSensitive' : True, | |
| 1958 'Query' : { 'PatientName' : '*ne*' }}) | |
| 1959 self.assertEqual(0, len(a)) | |
| 1960 | |
| 1961 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 1962 'CaseSensitive' : True, | |
| 1963 'Query' : { 'PatientName' : '*NE*' }}) | |
| 1964 self.assertEqual(1, len(a)) | |
| 1965 | |
| 1966 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 1967 'CaseSensitive' : True, | |
| 1968 'Query' : { 'PatientName' : '*NE*' }}) | |
| 1969 self.assertEqual(2, len(a)) | |
| 1970 | |
| 1971 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', | |
| 1972 'CaseSensitive' : True, | |
| 1973 'Query' : { 'PatientName' : '*NE*' }}) | |
| 1974 self.assertEqual(4, len(a)) | |
| 1975 | |
| 1976 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', 'Query' : { }}) | |
| 1977 self.assertEqual(2, len(a)) | |
| 1978 | |
| 1979 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', 'Query' : { }}) | |
| 1980 self.assertEqual(2, len(a)) | |
| 1981 | |
| 1982 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', 'Query' : { }}) | |
| 1983 self.assertEqual(4, len(a)) | |
| 1984 | |
| 1985 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', 'Query' : { }}) | |
| 1986 self.assertEqual(8, len(a)) | |
| 1987 | |
|
194
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1988 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1989 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1990 'Query' : { 'StudyDate' : '20061201-20061201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1991 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1992 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1993 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1994 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1995 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1996 'Query' : { 'StudyDate' : '20061201-20091201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1997 self.assertEqual(2, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1998 for i in range(2): |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1999 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2000 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2001 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2002 'Query' : { 'StudyDate' : '20061202-20061202' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2003 self.assertEqual(0, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2004 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2005 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2006 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2007 'Query' : { 'StudyDate' : '-20061201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2008 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2009 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2010 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2011 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2012 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2013 'Query' : { 'StudyDate' : '-20051201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2014 self.assertEqual(0, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2015 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2016 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2017 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2018 'Query' : { 'StudyDate' : '20061201-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2019 self.assertEqual(2, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2020 for i in range(2): |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2021 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2022 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2023 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2024 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2025 'Query' : { 'StudyDate' : '20061202-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2026 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2027 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2028 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2029 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2030 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2031 'Query' : { 'StudyDate' : '20080819-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2032 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2033 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2034 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2035 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2036 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2037 'Query' : { 'StudyDate' : '20080820-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2038 self.assertEqual(0, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2039 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2040 |
| 14 | 2041 |
| 2042 def test_rest_query_retrieve(self): | |
| 2043 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 2044 | |
| 2045 # Upload 8 instances | |
| 2046 for i in range(2): | |
| 2047 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 2048 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 2049 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 2050 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 2051 | |
| 2052 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 2053 for p in DoGet(_REMOTE, '/patients'): | |
| 2054 DoPost(_REMOTE, '/modalities/orthanctest/store', p) | |
| 2055 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 2056 | |
| 2057 for q in DoGet(_REMOTE, '/queries'): | |
| 2058 DoDelete(_REMOTE, '/queries/%s' % q) | |
| 2059 | |
| 2060 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 2061 self.assertEqual(0, len(DoGet(_REMOTE, '/queries'))) | |
| 2062 a = DoPost(_REMOTE, '/modalities/orthanctest/query', { 'Level' : 'Series', | |
| 27 | 2063 'Query' : { |
| 2064 'PatientName' : '*NE*', | |
| 2065 'StudyDate' : '*', | |
| 2066 }})['ID'] | |
| 14 | 2067 self.assertEqual(1, len(DoGet(_REMOTE, '/queries'))) |
| 2068 | |
| 2069 b = DoGet(_REMOTE, '/queries/%s' % a) | |
| 2070 self.assertTrue('answers' in b) | |
| 2071 self.assertTrue('level' in b) | |
| 2072 self.assertTrue('modality' in b) | |
| 2073 self.assertTrue('query' in b) | |
| 2074 self.assertTrue('retrieve' in b) | |
| 2075 self.assertEqual('Series', DoGet(_REMOTE, '/queries/%s/level' % a)) | |
| 2076 self.assertEqual('orthanctest', DoGet(_REMOTE, '/queries/%s/modality' % a)) | |
| 2077 | |
| 2078 q = DoGet(_REMOTE, '/queries/%s/query?simplify' % a) | |
| 27 | 2079 self.assertEqual(2, len(q)) |
| 14 | 2080 self.assertTrue('PatientName' in q) |
| 27 | 2081 self.assertTrue('StudyDate' in q) |
| 14 | 2082 self.assertEqual('*NE*', q['PatientName']) |
| 27 | 2083 self.assertEqual('*', q['StudyDate']) |
| 14 | 2084 |
| 2085 self.assertEqual(2, len(DoGet(_REMOTE, '/queries/%s/answers' % a))) | |
| 2086 | |
| 2087 s = DoGet(_REMOTE, '/queries/%s/answers/0' % a) | |
| 2088 self.assertTrue('content' in s) | |
| 2089 self.assertTrue('retrieve' in s) | |
| 2090 | |
| 2091 s = DoGet(_REMOTE, '/queries/%s/answers/0/content?simplify' % a) | |
| 2092 self.assertEqual('887', s['PatientID']) | |
| 2093 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', s['StudyInstanceUID']) | |
| 2094 | |
| 2095 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 2096 DoPost(_REMOTE, '/queries/%s/answers/0/retrieve' % a, 'ORTHANC') | |
| 2097 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 2098 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 2099 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 2100 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) | |
| 2101 | |
| 112 | 2102 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) |
| 14 | 2103 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
| 2104 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 2105 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 2106 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) | |
| 2107 | |
|
186
8feebc2bf9fc
test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
183
diff
changeset
|
2108 # New in Orthanc 1.4.3 |
|
8feebc2bf9fc
test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
183
diff
changeset
|
2109 s = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) |
|
8feebc2bf9fc
test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
183
diff
changeset
|
2110 self.assertEqual(2, len(s)) |
|
8feebc2bf9fc
test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
183
diff
changeset
|
2111 for i in range(2): |
|
8feebc2bf9fc
test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
183
diff
changeset
|
2112 self.assertEqual('SERIES', s[i]['QueryRetrieveLevel']) |
|
8feebc2bf9fc
test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
183
diff
changeset
|
2113 self.assertEqual('887', s[i]['PatientID']) |
|
8feebc2bf9fc
test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
183
diff
changeset
|
2114 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', s[i]['StudyInstanceUID']) |
|
8feebc2bf9fc
test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
183
diff
changeset
|
2115 |
| 14 | 2116 DoDelete(_REMOTE, '/queries/%s' % a) |
| 2117 self.assertEqual(0, len(DoGet(_REMOTE, '/queries'))) | |
| 2118 | |
| 2119 | |
| 2120 def test_parent(self): | |
| 2121 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 2122 patient = '6816cb19-844d5aee-85245eba-28e841e6-2414fae2' | |
| 2123 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' | |
| 2124 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 2125 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d' | |
|
107
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
2126 self.assertEqual(instance, u) |
| 14 | 2127 |
| 2128 a = DoGet(_REMOTE, '/studies/%s/patient' % study) | |
| 2129 self.assertEqual('Patient', a['Type']) | |
| 2130 self.assertEqual(patient, a['ID']) | |
| 2131 | |
| 2132 a = DoGet(_REMOTE, '/series/%s/patient' % series) | |
| 2133 self.assertEqual('Patient', a['Type']) | |
| 2134 self.assertEqual(patient, a['ID']) | |
| 2135 | |
| 2136 a = DoGet(_REMOTE, '/series/%s/study' % series) | |
| 2137 self.assertEqual('Study', a['Type']) | |
| 2138 self.assertEqual(study, a['ID']) | |
| 2139 | |
| 2140 a = DoGet(_REMOTE, '/instances/%s/patient' % instance) | |
| 2141 self.assertEqual('Patient', a['Type']) | |
| 2142 self.assertEqual(patient, a['ID']) | |
| 2143 | |
| 2144 a = DoGet(_REMOTE, '/instances/%s/study' % instance) | |
| 2145 self.assertEqual('Study', a['Type']) | |
| 2146 self.assertEqual(study, a['ID']) | |
| 2147 | |
| 2148 a = DoGet(_REMOTE, '/instances/%s/series' % instance) | |
| 2149 self.assertEqual('Series', a['Type']) | |
| 2150 self.assertEqual(series, a['ID']) | |
| 2151 | |
| 2152 | |
| 2153 def test_shanon(self): | |
| 2154 def Anonymize(instance, replacements = {}): | |
| 119 | 2155 return DoPost(_REMOTE, '/instances/%s/anonymize' % instance, { |
| 2156 'Replace' : replacements, | |
| 2157 'Force' : True, | |
| 2158 }, 'application/json') | |
| 14 | 2159 |
| 2160 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 2161 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 2162 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 2163 | |
| 2164 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ] | |
| 2165 ids = [ 'ozp00SjY2xG', | |
| 2166 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 2167 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 2168 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ] | |
| 2169 | |
| 2170 a = ExtractDicomTags(Anonymize(u), tags) | |
| 2171 for i in range(4): | |
| 2172 self.assertNotEqual(ids[i], a[i]) | |
| 2173 self.assertTrue(a[4].startswith('Orthanc')) | |
| 2174 | |
| 2175 a = ExtractDicomTags(Anonymize(u, { 'PatientName' : 'toto' }), tags) | |
| 2176 for i in range(4): | |
| 2177 self.assertNotEqual(ids[i], a[i]) | |
| 2178 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2179 | |
| 2180 a = ExtractDicomTags(Anonymize(u, { 'SOPInstanceUID' : 'instance' }), tags) | |
| 2181 self.assertEqual('instance', a[3]) | |
| 2182 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2183 | |
| 2184 a = ExtractDicomTags(Anonymize(u, { 'SeriesInstanceUID' : 'series' }), tags) | |
| 2185 self.assertEqual('series', a[2]) | |
| 2186 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2187 | |
| 2188 a = ExtractDicomTags(Anonymize(u, { 'StudyInstanceUID' : 'study' }), tags) | |
| 2189 self.assertEqual('study', a[1]) | |
| 2190 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2191 | |
| 2192 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient' }), tags) | |
| 2193 self.assertEqual('patient', a[0]) | |
| 2194 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2195 | |
| 2196 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient', | |
| 2197 'StudyInstanceUID' : 'study', | |
| 2198 'SeriesInstanceUID' : 'series', | |
| 2199 'SOPInstanceUID' : 'instance' }), tags) | |
| 2200 self.assertEqual('patient', a[0]) | |
| 2201 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2202 | |
| 2203 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 2204 | |
| 2205 | |
| 2206 def test_shanon_2(self): | |
| 2207 def Modify(instance, replacements = {}): | |
| 119 | 2208 return DoPost(_REMOTE, '/instances/%s/modify' % instance, { |
| 2209 'Replace' : replacements, | |
| 2210 'Force': True, | |
| 2211 }, 'application/json') | |
| 14 | 2212 |
| 2213 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 2214 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 2215 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 2216 | |
| 2217 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ] | |
| 2218 ids = [ 'ozp00SjY2xG', | |
| 2219 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 2220 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 2221 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ] | |
| 2222 | |
| 2223 a = ExtractDicomTags(Modify(u), tags) | |
| 2224 self.assertEqual(ids[0], a[0]) | |
| 2225 self.assertEqual(ids[1], a[1]) | |
| 2226 self.assertEqual(ids[2], a[2]) | |
| 2227 self.assertNotEqual(ids[3], a[3]) | |
| 2228 self.assertEqual(0, len(a[4])) | |
| 2229 | |
| 2230 a = ExtractDicomTags(Modify(u, { 'SOPInstanceUID' : 'instance' }), tags) | |
| 2231 self.assertEqual(ids[0], a[0]) | |
| 2232 self.assertEqual(ids[1], a[1]) | |
| 2233 self.assertEqual(ids[2], a[2]) | |
| 2234 self.assertEqual('instance', a[3]) | |
| 2235 | |
| 2236 a = ExtractDicomTags(Modify(u, { 'SeriesInstanceUID' : 'series' }), tags) | |
| 2237 self.assertEqual(ids[0], a[0]) | |
| 2238 self.assertEqual(ids[1], a[1]) | |
| 2239 self.assertEqual('series', a[2]) | |
| 2240 self.assertNotEqual(ids[3], a[3]) | |
| 2241 | |
| 2242 a = ExtractDicomTags(Modify(u, { 'StudyInstanceUID' : 'study' }), tags) | |
| 2243 self.assertEqual(ids[0], a[0]) | |
| 2244 self.assertEqual('study', a[1]) | |
| 2245 self.assertNotEqual(ids[2], a[2]) | |
| 2246 self.assertNotEqual(ids[3], a[3]) | |
| 2247 | |
| 2248 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient' }), tags) | |
| 2249 self.assertEqual('patient', a[0]) | |
| 2250 self.assertNotEqual(ids[1], a[1]) | |
| 2251 self.assertNotEqual(ids[2], a[2]) | |
| 2252 self.assertNotEqual(ids[3], a[3]) | |
| 2253 | |
| 2254 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient', | |
| 2255 'StudyInstanceUID' : 'study', | |
| 2256 'SeriesInstanceUID' : 'series', | |
| 2257 'SOPInstanceUID' : 'instance' }), tags) | |
| 2258 self.assertEqual('patient', a[0]) | |
| 2259 self.assertEqual('study', a[1]) | |
| 2260 self.assertEqual('series', a[2]) | |
| 2261 self.assertEqual('instance', a[3]) | |
| 2262 | |
| 2263 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 2264 | |
| 2265 | |
| 2266 def test_instances_tags(self): | |
| 2267 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 2268 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')['ID'] | |
| 2269 #a = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386937.676343')['ID'] | |
| 2270 #b = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386925.676329')['ID'] | |
| 2271 | |
| 2272 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/patients')[0]) | |
| 2273 self.assertEqual(2, len(i)) | |
| 2274 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 2275 self.assertEqual('887', i[i.keys()[1]]['PatientID']) | |
| 2276 | |
| 2277 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/studies')[0]) | |
| 2278 self.assertEqual(2, len(i)) | |
| 2279 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 2280 self.assertEqual('887', i[i.keys()[1]]['PatientID']) | |
| 2281 | |
| 2282 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 2283 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[0]) | |
| 2284 self.assertEqual(1, len(i)) | |
| 2285 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 2286 | |
| 2287 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[1]) | |
| 2288 self.assertEqual(1, len(i)) | |
| 2289 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 2290 | |
|
136
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2291 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
|
2292 self.assertEqual(1, len(i)) |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2293 self.assertEqual('887', i[i.keys()[0]]['0010,0020']) |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2294 |
| 14 | 2295 |
| 2296 def test_lookup(self): | |
| 2297 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG') | |
| 2298 self.assertEqual(0, len(a)) | |
| 2299 | |
| 2300 UploadInstance(_REMOTE, 'DummyCT.dcm') | |
| 2301 | |
| 2302 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG') | |
| 2303 self.assertEqual(1, len(a)) | |
| 2304 self.assertEqual('Patient', a[0]['Type']) | |
| 2305 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', a[0]['ID']) | |
| 2306 self.assertEqual('/patients/%s' % a[0]['ID'], a[0]['Path']) | |
| 2307 | |
| 2308 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390') | |
| 2309 self.assertEqual(1, len(a)) | |
| 2310 self.assertEqual('Study', a[0]['Type']) | |
| 2311 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', a[0]['ID']) | |
| 2312 self.assertEqual('/studies/%s' % a[0]['ID'], a[0]['Path']) | |
| 2313 | |
| 2314 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394') | |
| 2315 self.assertEqual(1, len(a)) | |
| 2316 self.assertEqual('Series', a[0]['Type']) | |
| 2317 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', a[0]['ID']) | |
| 2318 self.assertEqual('/series/%s' % a[0]['ID'], a[0]['Path']) | |
| 2319 | |
| 2320 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109') | |
| 2321 self.assertEqual(1, len(a)) | |
| 2322 self.assertEqual('Instance', a[0]['Type']) | |
| 2323 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a[0]['ID']) | |
| 2324 self.assertEqual('/instances/%s' % a[0]['ID'], a[0]['Path']) | |
| 2325 | |
| 2326 DropOrthanc(_REMOTE) | |
| 2327 a = DoPost(_REMOTE, '/tools/lookup', '3113719P') | |
| 2328 self.assertEqual(0, len(a)) | |
| 2329 | |
| 15 | 2330 |
| 2331 def test_autorouting(self): | |
| 2332 knee1 = 'Knee/T1/IM-0001-0001.dcm' | |
| 2333 knee2 = 'Knee/T2/IM-0001-0002.dcm' | |
| 2334 other = 'Brainix/Flair/IM-0001-0001.dcm' | |
| 2335 | |
| 2336 # Check that this version is >= 0.8.0 | |
| 2337 self.assertTrue(IsDefinedInLua(_REMOTE, '_InitializeJob')) | |
| 2338 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities')) | |
| 2339 | |
| 2340 UploadInstance(_REMOTE, knee1) | |
| 2341 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 2342 | |
| 2343 DropOrthanc(_REMOTE) | |
| 2344 DropOrthanc(_LOCAL) | |
| 174 | 2345 InstallLuaScriptFromPath(_REMOTE, 'Lua/Autorouting.lua') |
| 15 | 2346 UploadInstance(_REMOTE, knee1) |
| 2347 UploadInstance(_REMOTE, knee2) | |
| 2348 UploadInstance(_REMOTE, other) | |
| 2349 WaitEmpty(_REMOTE) | |
| 174 | 2350 UninstallLuaCallbacks(_REMOTE) |
| 15 | 2351 self.assertEqual(3, len(DoGet(_LOCAL, '/instances'))) |
| 2352 | |
| 2353 DropOrthanc(_REMOTE) | |
| 2354 DropOrthanc(_LOCAL) | |
| 174 | 2355 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingConditional.lua') |
| 15 | 2356 UploadInstance(_REMOTE, knee1) |
| 2357 UploadInstance(_REMOTE, knee2) | |
| 2358 UploadInstance(_REMOTE, other) | |
| 2359 WaitEmpty(_REMOTE) | |
| 174 | 2360 UninstallLuaCallbacks(_REMOTE) |
| 15 | 2361 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
| 2362 | |
| 2363 DropOrthanc(_REMOTE) | |
| 2364 DropOrthanc(_LOCAL) | |
| 174 | 2365 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingModification.lua') |
| 15 | 2366 UploadInstance(_REMOTE, knee1) |
| 2367 WaitEmpty(_REMOTE) | |
| 174 | 2368 UninstallLuaCallbacks(_REMOTE) |
| 15 | 2369 i = DoGet(_LOCAL, '/instances') |
| 2370 self.assertEqual(1, len(i)) | |
| 2371 | |
| 2372 with tempfile.NamedTemporaryFile(delete = True) as f: | |
| 2373 f.write(DoGet(_LOCAL, '/instances/%s/file' % i[0])) | |
| 2374 f.flush() | |
| 45 | 2375 routed = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ]) |
| 15 | 2376 self.assertEqual('My Medical Device', re.search('"StationName">(.*?)<', routed).group(1).strip()) |
| 2377 self.assertEqual(None, re.search('"MilitaryRank"', routed)) | |
| 2378 self.assertEqual(None, re.search('"0051,0010"', routed)) # A private tag | |
| 17 | 2379 |
| 2380 | |
| 2381 def test_storescu_rf(self): | |
| 2382 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] | |
| 2383 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 2384 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 2385 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 18 | 2386 |
| 2387 | |
| 2388 def test_anonymize_instance(self): | |
| 2389 def AnonymizeAndUpload(instanceId, parameters): | |
| 2390 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/anonymize' % instanceId, parameters, | |
| 2391 'application/json'), 'application/dicom')['ID'] | |
| 2392 | |
| 2393 def ModifyAndUpload(instanceId, parameters): | |
| 2394 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/modify' % instanceId, parameters, | |
| 2395 'application/json'), 'application/dicom')['ID'] | |
| 2396 | |
| 2397 a = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] | |
| 2398 s1 = DoGet(_REMOTE, '/instances/%s/content/PatientName' % a) | |
| 2399 s2 = DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % a) # Some private tag | |
| 2400 s3 = DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % a) | |
| 2401 s4 = DoGet(_REMOTE, '/instances/%s/content/SeriesDescription' % a) | |
| 2402 s5 = DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a) | |
| 2403 | |
| 2404 b = AnonymizeAndUpload(a, '{}') | |
| 2405 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2406 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2407 | |
| 2408 # Keep private tag (only OK since Orthanc 0.8.0) | |
| 2409 b = AnonymizeAndUpload(a, '{"Keep":["00e1-10c2"]}') | |
| 2410 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2411 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2412 | |
| 2413 b = AnonymizeAndUpload(a, '{"Keep":["00e1,10c2","PatientName"]}') | |
| 2414 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2415 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2416 | |
| 2417 b = AnonymizeAndUpload(a, '{"Keep":["PatientName"],"Replace":{"00e1,10c2":"Hello"}}') | |
| 2418 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2419 self.assertTrue(DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b).startswith('Hello')) | |
| 2420 | |
| 2421 # Examples from the Wiki | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
2422 b = AnonymizeAndUpload(a, '{"Replace":{"PatientName":"hello","0010-0020":"world"},"Keep":["StudyDescription", "SeriesDescription"],"KeepPrivateTags": true,"Force":true}') |
| 18 | 2423 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip()) |
| 2424 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip()) | |
| 2425 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b)) | |
| 2426 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b)) | |
| 2427 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b)) | |
| 2428 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2429 DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a) | |
| 2430 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 2431 | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
2432 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Remove":["InstitutionName"],"RemovePrivateTags": true,"Force":true}') |
| 18 | 2433 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip()) |
| 2434 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip()) | |
| 2435 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b)) | |
| 2436 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b)) | |
| 2437 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2438 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 2439 | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
2440 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Force":true}') |
| 18 | 2441 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip()) |
| 2442 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip()) | |
| 2443 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1,10c2' % b)) | |
| 2444 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b)) | |
| 2445 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b)) | |
| 2446 self.assertEqual(s5, DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 2447 | |
| 2448 | |
| 2449 # Test modify non-existing | |
| 2450 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2451 json.dumps({ | |
| 2452 'PatientName' : 'Jodogne', | |
| 2453 'Modality' : 'CT', | |
| 2454 }))['ID'] | |
| 2455 | |
| 2456 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i).strip()) | |
| 2457 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % i)) | |
| 2458 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i).strip()) | |
| 2459 | |
| 2460 b = ModifyAndUpload(i, '{"Replace":{"StudyDescription":"hello","Modality":"world"}}') | |
| 2461 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % b).strip()) | |
| 2462 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % b).strip()) | |
| 2463 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/Modality' % b).strip()) | |
| 2464 | |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2465 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2466 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
|
2467 # 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
|
2468 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
|
2469 |
|
468
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2470 def storescu(image, acceptUnknownSopClassUid, expectSuccess = True, retries = 1): |
|
61
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2471 if acceptUnknownSopClassUid: |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2472 tmp = [ '-xf', GetDatabasePath('UnknownSopClassUid.cfg'), 'Default' ] |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2473 else: |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2474 tmp = [ '-xs' ] |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2475 |
|
468
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2476 while retries > 0: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2477 retries -= 1 |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2478 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
|
2479 try: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2480 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
|
2481 [ _REMOTE['Server'], str(_REMOTE['DicomPort']), |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2482 GetDatabasePath(image) ], |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2483 stderr = FNULL) |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2484 |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2485 if expectSuccess: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2486 return |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2487 except subprocess.CalledProcessError as e: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2488 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
|
2489 if not expectSuccess: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2490 raise e |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2491 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2492 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
|
2493 |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2494 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
|
2495 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
|
2496 '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
|
2497 ]) |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2498 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
|
2499 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
|
2500 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
|
2501 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
|
2502 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
|
2503 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
|
2504 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
|
2505 else: |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2506 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
|
2507 |
| 490 | 2508 # 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
|
2509 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
|
2510 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
|
2511 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
|
2512 |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2513 if IsOrthancVersionAbove(_REMOTE, 1, 9, 0): |
| 374 | 2514 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
|
2515 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
|
2516 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
|
2517 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
|
2518 else: |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2519 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
|
2520 |
|
62
f9c4ce95756f
removal of useless information
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
2521 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
|
2522 storescu('Knix/Loc/IM-0001-0001.dcm', False) |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2523 storescu('UnknownSopClassUid.dcm', True) |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2524 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2525 |
|
463
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
2526 # set back normal verbosity |
|
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
2527 DoPut(_REMOTE, '/tools/log-level', 'default') |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2528 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2529 def test_storescu_jpeg(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2530 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
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 knixStudy = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' |
| 64 | 2533 i = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm')['ID'] |
| 2534 | |
| 2535 # This is JPEG lossless | |
|
136
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2536 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header' % i)['0002,0010']['Value']) |
| 64 | 2537 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
|
2538 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header?short' % i)['0002,0010']) |
| 64 | 2539 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2540 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm') |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2541 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0003.dcm') |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2542 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2543 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
|
2544 b = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2545 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2546 DoPost(_REMOTE, '/modalities/orthanctest/store', [ knixStudy, a, b ]) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2547 self.assertEqual(5, len(DoGet(_LOCAL, '/instances'))) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2548 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2549 self.assertEqual(3, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2550 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2551 DropOrthanc(_REMOTE) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2552 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2553 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2554 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2555 def test_pixel_data(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2556 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
|
2557 color = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2558 phenix = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2559 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2560 phenixSize = 358 * 512 * 2 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2561 colorSize = 1000 * 1000 * 3 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2562 jpegSize = 51918 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2563 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2564 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
|
2565 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
|
2566 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
|
2567 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2568 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
|
2569 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
|
2570 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2571 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
|
2572 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
|
2573 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2574 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2575 def test_decode_brainix(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2576 brainix = [ |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2577 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'], # (*) |
| 384 | 2578 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
|
2579 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
|
2580 ] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2581 h = '6fb11b932d535c2be04beabd99793ff8' |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2582 maxValue = 426.0 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2583 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2584 truth = Image.open(GetDatabasePath('Formats/Brainix.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2585 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2586 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2587 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2588 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2589 truth2 = map(lambda x: min(255, x), truth.getdata()) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2590 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2591 self.AssertSameImages(truth2, '/instances/%s/image-uint8' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2592 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2593 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
|
2594 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2595 self.AssertSameImages(truth2, '/instances/%s/preview' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2596 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2597 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2598 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
|
2599 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2600 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2601 def test_decode_color(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2602 imagej = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2603 color = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2604 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2605 for i in [ imagej, color ]: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2606 for j in [ 'image-uint8', 'image-uint16', 'image-int16' ]: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2607 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
|
2608 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2609 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
|
2610 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
|
2611 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2612 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
|
2613 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
|
2614 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2615 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2616 def test_decode_rf(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2617 rf = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2618 truth = Image.open(GetDatabasePath('Formats/KarstenHilbertRF.png')) |
|
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 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2621 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2622 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2623 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2624 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2625 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
|
2626 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2627 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2628 def test_decode_multiframe(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2629 mf = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2630 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2631 # Test the first frame |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2632 truth = Image.open(GetDatabasePath('Formats/Multiframe0.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2633 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2634 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2635 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2636 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2637 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
|
2638 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2639 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
|
2640 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2641 # Test the last frame |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2642 truth = Image.open(GetDatabasePath('Formats/Multiframe75.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2643 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
|
2644 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2645 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2646 def test_decode_signed(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2647 signed = UploadInstance(_REMOTE, 'SignedCT.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2648 minValue = -2000 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2649 maxValue = 4042 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2650 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2651 truth = Image.open(GetDatabasePath('Formats/SignedCT.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2652 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2653 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2654 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
|
2655 self.AssertSameImages(truth2, '/instances/%s/image-uint16' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2656 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2657 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
|
2658 self.AssertSameImages(truth3, '/instances/%s/image-uint8' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2659 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2660 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
|
2661 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
|
2662 self.AssertSameImages(tmp, '/instances/%s/preview' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2663 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2664 self.assertEqual('b57e6c872a3da50877c7da689b03a444', ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % signed))) |
| 22 | 2665 |
| 2666 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
2667 def test_googlecode_issue_32(self): |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2668 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/default-encoding', 'nope')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2669 self.assertEqual('Windows1251', DoPut(_REMOTE, '/tools/default-encoding', 'Windows1251')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2670 self.assertEqual('Windows1251', DoGet(_REMOTE, '/tools/default-encoding')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2671 |
| 22 | 2672 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID'] |
| 2673 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f) | |
| 2674 self.assertEqual(u'Рентгенография', tags['SeriesDescription']) | |
| 2675 self.assertEqual(u'Таз', tags['BodyPartExamined']) | |
| 2676 self.assertEqual(u'Прямая', tags['ViewPosition']) | |
| 2677 | |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2678 # 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
|
2679 self.assertEqual('Latin1', DoPut(_REMOTE, '/tools/default-encoding', 'Latin1')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2680 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2681 DoDelete(_REMOTE, '/instances/%s' % f) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2682 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID'] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2683 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2684 self.assertNotEqual(u'Рентгенография', tags['SeriesDescription']) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2685 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2686 |
| 22 | 2687 def test_encodings(self): |
| 23 | 2688 # Latin-1 (ISO_IR 100) |
| 22 | 2689 brainix = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
| 2690 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % brainix) | |
| 2691 self.assertEqual(u'IRM cérébrale, neuro-crâne', tags['StudyDescription']) | |
| 23 | 2692 |
| 2693 # Latin-2 (ISO_IR 101) | |
| 2694 a = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID'] | |
| 2695 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % a) | |
| 2696 # dcm2xml MarekLatin2.dcm | iconv -f latin2 -t utf-8 | xmllint --format - | |
| 2697 self.assertEqual('Imię i Nazwisko osoby opisującej', | |
| 2698 i['ContentSequence'][4]['ConceptNameCodeSequence'][0]['CodeMeaning'].encode('utf-8')) | |
| 2699 | |
|
26
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2700 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2701 def test_storescu_custom_aet(self): |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2702 # 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
|
2703 # 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
|
2704 # in the REST API)." |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2705 # 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
|
2706 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2707 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2708 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2709 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2710 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2711 c = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0003.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2712 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2713 j = DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2714 'LocalAet' : 'YOP', |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2715 'Resources' : [ a['ID'], b['ID'] ] |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2716 }) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2717 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2718 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2719 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
|
2720 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2721 DropOrthanc(_LOCAL) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2722 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2723 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2724 j = DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2725 'Resources' : [ c['ID'] ] |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2726 }) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2727 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2728 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2729 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
|
2730 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2731 DropOrthanc(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2732 DropOrthanc(_LOCAL) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2733 |
| 174 | 2734 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingChangeAet.lua') |
|
26
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2735 DoPost(_REMOTE, '/tools/execute-script', 'aet = "HELLO"', 'application/lua') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2736 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2737 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2738 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2739 WaitEmpty(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2740 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2741 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
|
2742 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2743 DoPost(_REMOTE, '/tools/execute-script', 'aet = nill', 'application/lua') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2744 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2745 WaitEmpty(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2746 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2747 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
|
2748 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2749 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
|
2750 # 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
|
2751 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
|
2752 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
|
2753 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
|
2754 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
|
2755 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
|
2756 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2757 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
|
2758 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
|
2759 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
|
2760 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
|
2761 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2762 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
|
2763 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
|
2764 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2765 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
|
2766 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
|
2767 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
|
2768 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
|
2769 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
|
2770 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
|
2771 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
|
2772 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
|
2773 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
|
2774 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
|
2775 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
|
2776 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
|
2777 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
|
2778 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
|
2779 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
|
2780 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2781 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
|
2782 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
|
2783 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
|
2784 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
|
2785 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
|
2786 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
|
2787 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
|
2788 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2789 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
|
2790 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
|
2791 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
|
2792 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2793 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
|
2794 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
|
2795 self.assertTrue(instance in s) |
| 36 | 2796 |
| 2797 | |
| 2798 def test_create_pdf(self): | |
| 2799 # Upload 4 instances | |
| 2800 brainixInstance = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] | |
| 2801 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 2802 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 2803 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 2804 | |
| 2805 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0' | |
| 2806 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' | |
| 2807 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8' | |
| 2808 | |
| 2809 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f: | |
| 2810 pdf = f.read() | |
| 2811 | |
| 2812 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2813 json.dumps({ | |
| 2814 'Tags' : { | |
| 2815 'PatientName' : 'Jodogne', | |
| 2816 'Modality' : 'CT', | |
| 2817 }, | |
| 2818 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 2819 })) | |
| 2820 | |
| 2821 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
|
446
9184e6cb215a
allow custom value for "Modality" in /tools/create-dicom for PDF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
445
diff
changeset
|
2822 # 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
|
2823 # 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
|
2824 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip()) |
| 36 | 2825 |
| 2826 b = DoGet(_REMOTE, '/instances/%s/content/0042-0011' % i['ID']) | |
| 2827 self.assertEqual(len(b), len(pdf) + 1) | |
| 2828 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf + '\0')) | |
| 2829 | |
| 2830 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/tools/create-dicom', | |
| 2831 json.dumps({ | |
| 2832 'Parent' : brainixPatient, | |
| 2833 'Tags' : { | |
| 2834 'PatientName' : 'Jodogne', | |
| 2835 } | |
| 2836 }))) | |
| 2837 | |
| 2838 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2839 json.dumps({ | |
| 2840 'Parent' : brainixPatient, | |
| 2841 'Tags' : { 'StudyDescription' : 'PDF^Patient' }, | |
| 2842 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 2843 })) | |
| 2844 | |
| 2845 self.assertEqual(brainixPatient, DoGet(_REMOTE, '/instances/%s/patient' % i['ID'])['ID']) | |
| 2846 | |
| 2847 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2848 json.dumps({ | |
| 2849 'Parent' : brainixStudy, | |
| 2850 'Tags' : { 'SeriesDescription' : 'PDF^Study' }, | |
| 2851 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 2852 })) | |
| 2853 | |
| 2854 self.assertEqual(brainixStudy, DoGet(_REMOTE, '/instances/%s/study' % i['ID'])['ID']) | |
| 2855 | |
| 2856 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2857 json.dumps({ | |
| 2858 'Parent' : brainixEpi, | |
| 37 | 2859 'Tags' : { 'SpecificCharacterSet' : 'ISO_IR 13' }, |
| 36 | 2860 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) |
| 2861 })) | |
| 2862 | |
| 2863 self.assertEqual(brainixEpi, DoGet(_REMOTE, '/instances/%s/series' % i['ID'])['ID']) | |
| 2864 | |
| 2865 b = DoGet(_REMOTE, '/instances/%s/pdf' % i['ID']) | |
| 2866 self.assertEqual(len(b), len(pdf)) | |
| 2867 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf)) | |
| 2868 | |
| 2869 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/pdf' % brainixInstance)) | |
| 38 | 2870 |
| 2871 | |
| 2872 def test_create_series(self): | |
| 2873 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2874 json.dumps({ | |
| 2875 'Tags' : { | |
| 40 | 2876 'SpecificCharacterSet' : 'ISO_IR 100', |
| 2877 'PatientName' : 'Sébastien Jodogne', | |
| 38 | 2878 'Modality' : 'CT', |
| 2879 }, | |
| 2880 'Content' : [ | |
| 40 | 2881 { |
| 2882 'Content': 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==', # red dot in RGBA | |
| 2883 'Tags' : { 'ImageComments' : 'Tutu' } | |
| 2884 }, | |
| 38 | 2885 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAoUlEQVQ4jZ2SWw3EIBREjwUsYAELa2EtoAULFUCyXAtroRZqoRbox254BdLC/DZnZjoXWJFgCDg8egW2CBEhEnDzyRk+Ecxz2KP/0AL8S99T+jQccAVs22qKwAuPuq0uyNg9cPLh3am+pe/dkHLZtqJHj6vXJrZ7nvzvxxgemXgUwnGfXqpee09mUwp8m022OYP6bLF7mVuVe0y/umxinsAXRd9z0k1ubWsAAAAASUVORK5CYII=', |
| 2886 ] | |
| 2887 })) | |
| 2888 | |
| 2889 s = DoGet(_REMOTE, i['Path']) | |
| 2890 self.assertEqual('Series', s['Type']) | |
| 2891 self.assertEqual(s['ID'], i['ID']) | |
| 2892 self.assertEqual(2, len(s['Instances'])) | |
| 39 | 2893 self.assertEqual(2, s['ExpectedNumberOfInstances']) |
| 2894 self.assertEqual('Complete', s['Status']) | |
| 40 | 2895 |
| 2896 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][0]) | |
| 2897 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][1]) | |
| 2898 self.assertTrue('ImageComments' in a or 'ImageComments' in b) | |
| 2899 if 'ImageComments' in a: | |
| 2900 self.assertEqual('Tutu', a['ImageComments']) | |
| 2901 else: | |
| 2902 self.assertEqual('Tutu', b['ImageComments']) | |
| 2903 | |
| 2904 patient = DoGet(_REMOTE, '/instances/%s/patient' % s['Instances'][0]) | |
| 2905 self.assertEqual(patient['MainDicomTags']['PatientName'].encode('utf-8'), | |
| 2906 'Sébastien Jodogne') | |
| 47 | 2907 |
| 2908 | |
| 2909 def test_create_binary(self): | |
| 2910 binary = ''.join(map(chr, range(256))) | |
| 2911 encoded = 'data:application/octet-stream;base64,' + base64.b64encode(binary) | |
| 2912 tags = { | |
| 2913 'PatientName' : 'Jodogne', | |
| 2914 '8899-8899' : encoded | |
| 2915 } | |
| 2916 | |
| 2917 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2918 json.dumps({ | |
| 266 | 2919 'Tags' : tags, |
| 2920 'PrivateCreator' : 'TestBinary', | |
| 47 | 2921 })) |
| 2922 | |
| 2923 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 2924 self.assertEqual(binary, DoGet(_REMOTE, '/instances/%s/content/8899-8899' % i['ID']).strip()) | |
| 2925 | |
| 2926 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2927 json.dumps({ | |
| 2928 'InterpretBinaryTags' : False, | |
| 266 | 2929 'Tags' : tags, |
| 2930 'PrivateCreator' : 'TestBinary', | |
| 47 | 2931 })) |
| 2932 | |
| 2933 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 2934 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
|
2935 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2936 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2937 def test_patient_ids_collision(self): |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2938 # 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
|
2939 # same PatientID |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2940 for i in range(3): |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2941 UploadInstance(_REMOTE, 'PatientIdsCollision/Image%d.dcm' % (i + 1)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2942 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2943 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2944 'Query' : { 'PatientName' : '*' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2945 self.assertEqual(1, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2946 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
|
2947 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2948 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2949 'CaseSensitive' : True, |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2950 'Query' : { 'PatientName' : 'FOO\\HELLO' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2951 self.assertEqual(2, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2952 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2953 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2954 'CaseSensitive' : False, |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2955 'Query' : { 'PatientName' : 'Foo' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2956 self.assertEqual(1, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2957 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
|
2958 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
|
2959 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
|
2960 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2961 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2962 'Query' : { 'PatientName' : '*' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2963 self.assertEqual(3, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2964 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
|
2965 self.assertTrue('FOO^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2966 self.assertTrue('HELLO^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2967 self.assertTrue('WORLD^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2968 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2969 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
|
2970 self.assertEqual(1, len(set(d))) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2971 self.assertEqual('COMMON', d[0]) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2972 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2973 for i in a: |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2974 d = DoGet(_REMOTE, '/studies/%s' % i) ['MainDicomTags']['StudyDescription'] |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2975 p = DoGet(_REMOTE, '/studies/%s' % i) ['PatientMainDicomTags']['PatientName'] |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2976 self.assertEqual('%s^SERIES' % p, d) |
|
49
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2977 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2978 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2979 def test_bitbucket_issue_4(self): |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2980 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2981 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2982 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2983 UploadInstance(_REMOTE, 'Formats/Jpeg.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2984 UploadInstance(_REMOTE, 'Formats/JpegLossless.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2985 UploadInstance(_REMOTE, 'Formats/Rle.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2986 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2987 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2988 self.assertEqual(6, len(DoGet(_REMOTE, '/instances'))) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2989 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2990 p = DoGet(_REMOTE, '/patients') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2991 self.assertEqual(2, len(p)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2992 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
|
2993 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
|
2994 self.assertEqual(3, len(i1)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2995 self.assertEqual(3, len(i2)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2996 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2997 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
|
2998 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2999 self.assertEqual(6, len(DoGet(_LOCAL, '/instances'))) |
|
50
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3000 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3001 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3002 def test_create_sequence(self): |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3003 i = DoPost(_REMOTE, '/tools/create-dicom', |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3004 json.dumps({ |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3005 'Tags' : { |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3006 'SpecificCharacterSet': 'ISO_IR 100', # Encode using Latin1 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3007 'PatientName': 'Jodogne^', |
|
51
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3008 'ReferencedStudySequence': GenerateTestSequence(), |
|
50
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3009 } |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3010 }))['ID'] |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3011 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3012 self.assertEqual('Jodogne^', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i)) |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3013 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
|
3014 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
|
3015 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
|
3016 self.assertEqual(u'Sébastien^'.encode('latin-1'), |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3017 DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence/1/StudyDescription' % i)) |
|
51
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3018 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3019 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3020 def test_modify_sequence(self): |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3021 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3022 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
|
3023 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3024 j = DoPost(_REMOTE, '/instances/%s/modify' % i, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3025 json.dumps({ |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3026 "Replace" : { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3027 "PatientName" : "hello", |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3028 'ReferencedStudySequence': GenerateTestSequence(), |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3029 }, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3030 }), |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3031 'application/json') |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3032 j = DoPost(_REMOTE, '/instances', j, 'application/dicom')['ID'] |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3033 DoDelete(_REMOTE, '/instances/%s' % i) |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3034 |
| 52 | 3035 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence' % j))) |
| 3036 | |
| 3037 | |
| 3038 def test_compression(self): | |
| 3039 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 3040 | |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3041 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
|
3042 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
|
3043 # 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
|
3044 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
|
3045 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
|
3046 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3047 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
|
3048 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
|
3049 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
|
3050 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3051 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
|
3052 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3053 # 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
|
3054 # 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
|
3055 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
|
3056 DoPost(_REMOTE, '/instances/%s/attachments/dicom/uncompress' % i) |
| 52 | 3057 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3058 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
|
3059 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
|
3060 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
|
3061 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
|
3062 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
|
3063 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
|
3064 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
|
3065 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3066 ops = DoGet(_REMOTE, '/instances/%s/attachments/dicom' % i) |
| 52 | 3067 self.assertTrue('compress' in ops) |
| 3068 self.assertTrue('uncompress' in ops) | |
| 3069 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
|
3070 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
|
3071 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
|
3072 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3073 # Re-compress the attachment |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3074 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
|
3075 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
|
3076 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
|
3077 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
|
3078 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
|
3079 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
|
3080 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
|
3081 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
|
3082 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
|
3083 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
|
3084 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3085 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
|
3086 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
|
3087 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
|
3088 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
|
3089 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
|
3090 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
|
3091 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
|
3092 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
|
3093 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
|
3094 self.assertEqual(us, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 53 | 3095 |
| 3096 | |
| 3097 def test_ordered_slices(self): | |
| 3098 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] | |
| 3099 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 3100 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 3101 self.assertEqual('Sequence', o['Type']) | |
| 3102 self.assertEqual(1, len(o['Dicom'])) | |
| 3103 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/file', o['Dicom'][0]) | |
| 3104 self.assertEqual(76, len(o['Slices'])) | |
| 3105 for j in range(76): | |
| 3106 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/frames/%d' % j, o['Slices'][j]) | |
| 3107 | |
| 68 | 3108 self.assertEqual(1, len(o['SlicesShort'])) |
| 3109 self.assertEqual('9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02', o['SlicesShort'][0][0]) | |
| 3110 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 3111 self.assertEqual(76, o['SlicesShort'][0][2]) | |
| 3112 | |
| 53 | 3113 i = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
| 3114 j = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')['ID'] | |
| 3115 k = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')['ID'] | |
| 3116 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 3117 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 3118 | |
| 3119 self.assertEqual('Volume', o['Type']) | |
| 3120 self.assertEqual(3, len(o['Dicom'])) | |
| 3121 self.assertEqual(3, len(o['Slices'])) | |
| 3122 self.assertEqual('/instances/%s/file' % i, o['Dicom'][2]) | |
| 3123 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1]) | |
| 3124 self.assertEqual('/instances/%s/file' % k, o['Dicom'][0]) | |
| 3125 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][2]) | |
| 3126 self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1]) | |
| 3127 self.assertEqual('/instances/%s/frames/0' % k, o['Slices'][0]) | |
| 3128 | |
| 68 | 3129 self.assertEqual(3, len(o['SlicesShort'])) |
| 3130 self.assertEqual(k, o['SlicesShort'][0][0]) | |
| 3131 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 3132 self.assertEqual(1, o['SlicesShort'][0][2]) | |
| 3133 self.assertEqual(j, o['SlicesShort'][1][0]) | |
| 3134 self.assertEqual(0, o['SlicesShort'][1][1]) | |
| 3135 self.assertEqual(1, o['SlicesShort'][1][2]) | |
| 3136 self.assertEqual(i, o['SlicesShort'][2][0]) | |
| 3137 self.assertEqual(0, o['SlicesShort'][2][1]) | |
| 3138 self.assertEqual(1, o['SlicesShort'][2][2]) | |
| 3139 | |
| 53 | 3140 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID'] |
| 3141 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm')['ID'] | |
| 3142 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 3143 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 3144 | |
| 3145 self.assertEqual('Sequence', o['Type']) | |
| 3146 self.assertEqual(2, len(o['Dicom'])) | |
| 3147 self.assertEqual(2, len(o['Slices'])) | |
| 3148 self.assertEqual('/instances/%s/file' % i, o['Dicom'][0]) | |
| 3149 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1]) | |
| 3150 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][0]) | |
| 3151 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
|
3152 |
| 68 | 3153 self.assertEqual(2, len(o['SlicesShort'])) |
| 3154 self.assertEqual(i, o['SlicesShort'][0][0]) | |
| 3155 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 3156 self.assertEqual(1, o['SlicesShort'][0][2]) | |
| 3157 self.assertEqual(j, o['SlicesShort'][1][0]) | |
| 3158 self.assertEqual(0, o['SlicesShort'][1][1]) | |
| 3159 self.assertEqual(1, o['SlicesShort'][1][2]) | |
| 3160 | |
| 3161 | |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3162 |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3163 def test_incoming_movescu_accession(self): |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3164 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3165 |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
3166 # No matching patient, so no job is created |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3167 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3168 CallMoveScu([ '--study', '-k', '0008,0052=STUDY', '-k', 'AccessionNumber=nope' ]) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3169 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3170 CallMoveScu([ '--study', '-k', '0008,0052=PATIENT', '-k', 'AccessionNumber=A10003245599' ]) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3171 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
3172 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
3173 # 1 Matching patient, track the job |
| 138 | 3174 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
| 3175 '--study', | |
| 3176 '-k', '0008,0052=STUDY', | |
| 3177 '-k', 'AccessionNumber=A10003245599' | |
| 3178 ]))) | |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
3179 |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3180 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3181 |
| 55 | 3182 |
| 3183 def test_dicom_to_json(self): | |
| 3184 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
|
3185 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
|
3186 |
|
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
3187 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
|
3188 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
|
3189 self.assertTrue(CompareTags(t, json.loads(f.read()), [ |
| 123 | 3190 # Tags for compatibility with DCMTK 3.6.0 |
| 3191 'RETIRED_OtherPatientIDs', | |
| 3192 'OtherPatientIDs', | |
| 3193 'ACR_NEMA_2C_VariablePixelDataGroupLength', | |
|
80
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
3194 ])) |
| 55 | 3195 |
| 3196 t = DoGet(_REMOTE, '/instances/%s/tags' % i) | |
| 3197 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
|
3198 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
|
3199 ])) |
| 55 | 3200 |
|
60
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
3201 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
|
3202 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
|
3203 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
|
3204 ])) |
|
60
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
3205 |
|
372
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3206 |
|
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3207 # 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
|
3208 # following command: |
|
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3209 # $ 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
|
3210 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
|
3211 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
|
3212 a = json.loads(f.read()) |
|
378
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3213 |
|
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3214 # 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
|
3215 # 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
|
3216 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
|
3217 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
|
3218 self.assertFalse('7fe1,1001' in t) |
|
378
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3219 del a['7fe1,0010'] |
|
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3220 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
|
3221 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3222 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
|
3223 self.assertTrue('7fe1,1001' in t) |
|
378
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3224 |
|
65
09fc27e0899a
patch for testing windows builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
3225 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
|
3226 tt = (json.dumps(t) |
|
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3227 .replace('2e+022', '2e+22') |
|
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3228 # 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
|
3229 .replace('IllegalPrivatePixelSequence', 'Unknown Tag & Data')) |
|
65
09fc27e0899a
patch for testing windows builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
3230 self.assertEqual(aa, tt) |
| 57 | 3231 |
| 3232 | |
| 3233 def test_batch_archive(self): | |
| 3234 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 3235 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') | |
| 3236 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 3237 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0002.dcm') | |
| 3238 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 3239 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm') | |
| 3240 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 3241 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm') | |
| 3242 | |
| 3243 s = DoPost(_REMOTE, '/tools/create-archive', [ ]) | |
| 3244 z = zipfile.ZipFile(StringIO(s), "r") | |
| 3245 self.assertEqual(0, len(z.namelist())) | |
| 3246 | |
| 3247 # One patient | |
| 3248 s = DoPost(_REMOTE, '/tools/create-archive', [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ]) | |
| 3249 z = zipfile.ZipFile(StringIO(s), "r") | |
| 3250 self.assertEqual(4, len(z.namelist())) | |
| 3251 | |
| 3252 # One patient + twice its study + one series from other patient | |
| 3253 s = DoPost(_REMOTE, '/tools/create-archive', [ | |
| 3254 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17', | |
| 3255 '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918', | |
| 3256 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' | |
| 3257 ]) | |
| 3258 z = zipfile.ZipFile(StringIO(s), "r") | |
| 3259 self.assertEqual(6, len(z.namelist())) | |
| 3260 | |
| 3261 # One patient + one series + one instance | |
| 3262 s = DoPost(_REMOTE, '/tools/create-archive', [ | |
| 3263 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17', | |
| 3264 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0', | |
| 3265 '1d429ccb-bdcc78a1-7d129d6a-ba4966ed-fe4dbd87' | |
| 3266 ]) | |
| 3267 z = zipfile.ZipFile(StringIO(s), "r") | |
| 3268 self.assertEqual(7, len(z.namelist())) | |
|
59
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3269 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3270 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3271 def test_decode_brainix_as_jpeg(self): |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3272 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
|
3273 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3274 j = GetImage(_REMOTE, '/instances/%s/preview' % i) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3275 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3276 self.assertEqual(j.size[0], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3277 self.assertEqual(j.size[1], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3278 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3279 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
|
3280 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3281 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3282 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
|
3283 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3284 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3285 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
|
3286 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3287 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3288 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
|
3289 self.assertEqual('JPEG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3290 self.assertEqual(j.size[0], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3291 self.assertEqual(j.size[1], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3292 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3293 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
|
3294 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
|
3295 self.assertLess(a, b) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3296 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3297 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
|
3298 self.assertEqual('JPEG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3299 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3300 # 16bit encoding is not supported with JPEG |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3301 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
|
3302 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
|
3303 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3304 # No matching content type |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3305 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
|
3306 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3307 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3308 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3309 def test_media_encodings(self): |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3310 ascii = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3311 latin1 = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3312 latin2 = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3313 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3314 tmp = DoPost(_REMOTE, '/tools/create-media', [ascii,latin1,latin2]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3315 z = zipfile.ZipFile(StringIO(tmp), "r") |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3316 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3317 self.assertEqual(4, len(z.namelist())) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3318 self.assertTrue('IMAGES/IM0' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3319 self.assertTrue('IMAGES/IM1' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3320 self.assertTrue('IMAGES/IM2' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3321 self.assertTrue('DICOMDIR' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3322 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3323 try: |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3324 os.remove('/tmp/DICOMDIR') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3325 except: |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3326 # The file does not exist |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3327 pass |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3328 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3329 z.extract('DICOMDIR', '/tmp') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3330 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ], |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3331 stderr = subprocess.STDOUT).split('\n') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3332 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3333 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ], |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3334 stderr = subprocess.STDOUT).split('\n') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3335 self.assertEqual(1, len(a)) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3336 self.assertEqual('', a[0]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3337 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3338 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3339 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
|
3340 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
|
3341 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
|
3342 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3343 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
|
3344 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3345 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3346 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
|
3347 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
|
3348 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
|
3349 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
|
3350 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3351 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
|
3352 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
|
3353 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
|
3354 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
|
3355 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3356 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
|
3357 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
|
3358 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
|
3359 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
|
3360 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3361 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
|
3362 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
|
3363 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
|
3364 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
|
3365 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3366 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
|
3367 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
|
3368 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
|
3369 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
|
3370 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3371 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
|
3372 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
|
3373 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
|
3374 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
|
3375 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3376 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
|
3377 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
|
3378 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
|
3379 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
|
3380 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
|
3381 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3382 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
|
3383 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
|
3384 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
|
3385 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
|
3386 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
|
3387 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
|
3388 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3389 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
|
3390 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
|
3391 self.assertEqual(1, len(s)) |
|
176
48cc188ffb09
strip trailing 0 char that appears with some findscu versions
am@osimis.io
parents:
175
diff
changeset
|
3392 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
|
3393 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
|
3394 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
|
3395 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3396 |
|
78
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3397 def test_decode_transfer_syntax(self): |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3398 def Check(t, md5): |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3399 i = UploadInstance(_REMOTE, 'TransferSyntaxes/%s.dcm' % t)['ID'] |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3400 |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
3401 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
|
3402 transferSyntax = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i) |
|
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
3403 self.assertEqual(t, transferSyntax) |
|
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
3404 |
|
78
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3405 if md5 == None: |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3406 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
|
3407 else: |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3408 m = ComputeMD5(DoGet(_REMOTE, '/instances/%s/preview' % i)) |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3409 self.assertEqual(m, md5) |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3410 |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3411 Check('1.2.840.10008.1.2.1', 'fae08d5415c4c0cd2cdbae4522408631') |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3412 Check('1.2.840.10008.1.2.2', 'f3d9784768b8feb54d6a50b6d5c37682') |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3413 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
|
3414 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
|
3415 Check('1.2.840.10008.1.2.4.70', '7132cfbc457305b04b59787030c785d2') |
| 384 | 3416 Check('1.2.840.10008.1.2.5', '6ff51ae525d362e0d04f550a64075a0e') # RLE, supported since Orthanc 1.0.1 |
| 3417 Check('1.2.840.10008.1.2', 'd54aed9f67a100984b42942cc2e9939b') | |
| 3418 | |
| 3419 # The 3 checks below don't work on big-endian | |
| 3420 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
|
3421 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
|
3422 Check('1.2.840.10008.1.2.4.81', '801579ae7cbf28e604ea74f2c99fa2ca') |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
3423 |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
3424 # JPEG2k image, not supported without GDCM plugin |
| 304 | 3425 if not HasGdcmPlugin(_REMOTE): |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
3426 Check('1.2.840.10008.1.2.4.90', None) |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
3427 Check('1.2.840.10008.1.2.4.91', None) |
| 79 | 3428 |
| 3429 | |
| 3430 def test_raw_frame(self): | |
| 3431 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] | |
| 3432 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 3433 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3434 self.assertEqual(512 * 512 * 2, len(a)) | |
| 3435 self.assertEqual(512 * 512 * 2, len(DoGet(_REMOTE, '/instances/%s/frames/23/raw' % s))) | |
| 3436 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/raw' % s)) | |
| 3437 self.assertEqual('1914287dc4d958eca21fdaacfb3482fa', ComputeMD5(a)) | |
| 3438 | |
| 3439 s = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] | |
| 3440 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 3441 self.assertEqual(186274, len(DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s))) | |
| 3442 self.assertEqual(189424, len(DoGet(_REMOTE, '/instances/%s/frames/75/raw' % s))) | |
| 3443 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/76/raw' % s)) | |
| 3444 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3445 self.assertEqual("L", im.mode) | |
| 3446 self.assertEqual(512, im.size[0]) | |
| 3447 self.assertEqual(512, im.size[1]) | |
| 3448 | |
| 3449 # Test an image with 2 JPEG frames spread over multiple fragments | |
| 3450 s = UploadInstance(_REMOTE, 'LenaTwiceWithFragments.dcm')['ID'] | |
| 3451 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 3452 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3453 b = DoGet(_REMOTE, '/instances/%s/frames/1/raw' % s) | |
| 3454 self.assertEqual(69214, len(a)) | |
| 3455 self.assertEqual(ComputeMD5(a), ComputeMD5(b)) | |
| 3456 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/2/raw' % s)) | |
| 3457 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3458 self.assertEqual("RGB", im.mode) | |
| 3459 self.assertEqual(512, im.size[0]) | |
| 3460 self.assertEqual(512, im.size[1]) | |
| 323 | 3461 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % s) # TODO - Doesn't work with GDCM 3.0.7 alone |
| 79 | 3462 self.assertEqual("RGB", im.mode) |
| 3463 self.assertEqual(512, im.size[0]) | |
| 3464 self.assertEqual(512, im.size[1]) | |
| 81 | 3465 |
| 3466 | |
| 3467 | |
| 3468 def test_rest_movescu(self): | |
| 3469 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 3470 | |
| 3471 # Upload 4 instances | |
| 3472 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 3473 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm') | |
| 3474 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 3475 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 3476 | |
| 3477 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 3478 for p in DoGet(_REMOTE, '/patients'): | |
| 3479 DoPost(_REMOTE, '/modalities/orthanctest/store', p) | |
| 3480 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 3481 | |
| 3482 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 3483 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3484 # Move instance Brainix/Flair/IM-0001-0001.dcm |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3485 DoPost(_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3486 'Level' : 'Instance', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3487 'Resources' : [ |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3488 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3489 '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
|
3490 '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
|
3491 '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
|
3492 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3493 ]}) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3494 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3495 # Move series Brainix/Flair/* |
| 81 | 3496 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
| 3497 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 3498 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 3499 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 3500 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3501 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3502 # Reset and test asynchronous C-Move at instance level |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3503 for p in DoGet(_REMOTE, '/patients'): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3504 DoDelete(_REMOTE, '/patients/%s' % p) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3505 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3506 DoPost(_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3507 'Level' : 'Instance', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3508 'Resources' : [ |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3509 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3510 '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
|
3511 '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
|
3512 '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
|
3513 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3514 ], |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3515 'Asynchronous': True |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3516 }) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3517 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3518 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3519 (_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3520 'Level' : 'Instance', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3521 'Resources' : [ |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3522 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3523 '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
|
3524 '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
|
3525 '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
|
3526 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3527 ], |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3528 'Asynchronous': True |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3529 })) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3530 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3531 self.assertNotEqual(None, job) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3532 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3533 # check the job was successfull |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3534 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3535 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3536 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3537 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3538 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3539 # check the job content |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3540 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content'] |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3541 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
|
3542 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
|
3543 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
|
3544 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3545 # Reset and test synchronous C-Move at series level |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3546 for p in DoGet(_REMOTE, '/patients'): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3547 DoDelete(_REMOTE, '/patients/%s' % p) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3548 |
| 81 | 3549 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series', |
| 3550 'Resources' : [ | |
| 3551 { | |
| 3552 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775', | |
| 3553 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', | |
| 3554 } | |
| 3555 ]}) | |
| 3556 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 3557 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 3558 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 3559 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) | |
| 3560 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3561 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3562 # 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
|
3563 for p in DoGet(_REMOTE, '/patients'): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3564 DoDelete(_REMOTE, '/patients/%s' % p) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3565 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3566 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3567 (_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3568 'Level' : 'Series', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3569 'Resources' : [ |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3570 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3571 'PatientID' : '5Yp0E', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3572 '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
|
3573 '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
|
3574 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3575 ], |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3576 'Asynchronous': True |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3577 })) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3578 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3579 self.assertNotEqual(None, job) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3580 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3581 # check the job was successfull |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3582 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3583 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3584 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3585 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3586 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3587 # check the job content |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3588 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content'] |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3589 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
|
3590 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
|
3591 self.assertEqual('5Yp0E', jobContent['Query'][0]['0010,0020']) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3592 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3593 # Move series Brainix/Epi/* |
| 81 | 3594 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series', |
| 3595 'Resources' : [ | |
| 3596 { | |
| 3597 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775', | |
| 3598 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314125550', | |
| 3599 } | |
| 3600 ]}) | |
| 3601 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 3602 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 3603 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 3604 self.assertEqual(3, len(DoGet(_REMOTE, '/instances'))) | |
| 3605 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3606 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3607 # Move study Knee asynchronously |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3608 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3609 (_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3610 'Level' : 'Study', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3611 'Resources' : [ |
|
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 '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
|
3614 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3615 ], |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3616 'Asynchronous': True |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3617 })) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3618 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3619 self.assertNotEqual(None, job) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3620 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3621 # check the job was successfull |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3622 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3623 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3624 self.assertEqual(3, len(DoGet(_REMOTE, '/series'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3625 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3626 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3627 # check the job content |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3628 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content'] |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3629 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', jobContent['Query'][0]['0020,000d']) |
| 81 | 3630 |
| 3631 # Reset | |
| 3632 for p in DoGet(_REMOTE, '/patients'): | |
| 3633 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 3634 | |
| 3635 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 3636 | |
| 3637 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3638 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3639 # Move all at once asynchronously at PatientLevel |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3640 job = MonitorJob2(_REMOTE, lambda: DoPost(_REMOTE, '/modalities/orthanctest/move', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3641 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3642 'Level' : 'Patient', |
|
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', |
| 81 | 3646 }, |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3647 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3648 'PatientID': '887', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3649 'PatientName' : 'KNEE', |
| 81 | 3650 } |
|
482
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 'Synchronous': False |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3653 })) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3654 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3655 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3656 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3657 self.assertEqual(3, len(DoGet(_REMOTE, '/series'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3658 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) |
| 81 | 3659 |
|
86
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3660 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3661 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3662 def test_reconstruct_json(self): |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3663 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3664 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3665 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3666 first = DoGet(_REMOTE, '/instances/%s/tags' % instance) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3667 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3668 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
|
3669 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3670 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
|
3671 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
|
3672 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3673 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
|
3674 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3675 # Cannot delete the "DICOM" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3676 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
|
3677 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3678 # Can delete the "DICOM as JSON" attachment |
|
392
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
3679 if not IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
3680 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
|
3681 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
|
3682 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3683 # Only the "DICOM" attachment subsists |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3684 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance))) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3685 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3686 # Cannot manually reconstruct the "DICOM as JSON" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3687 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
|
3688 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3689 # Transparently reconstruct the "DICOM as JSON" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3690 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
|
3691 second = DoGet(_REMOTE, '/instances/%s/tags' % instance) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3692 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
|
3693 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3694 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
|
3695 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
|
3696 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3697 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
|
3698 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
|
3699 self.assertEqual(str(first), str(third)) |
|
87
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3700 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3701 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3702 def test_reconstruct_json2(self): |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3703 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3704 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3705 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
|
3706 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
|
3707 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3708 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
|
3709 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
|
3710 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3711 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
|
3712 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
|
3713 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3714 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
|
3715 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
|
3716 self.assertEqual(aa, bb) |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3717 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
|
3718 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
|
3719 elif IsDicomUntilPixelDataStored(_REMOTE): |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3720 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
|
3721 self.assertEqual(aa, bb) |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3722 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
|
3723 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
|
3724 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3725 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
|
3726 self.assertEqual(aa, bb) |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3727 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
|
3728 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3729 # 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
|
3730 DoPost(_REMOTE, '/tools/invalidate-tags', '', 'text/plain') |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3731 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3732 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
|
3733 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
|
3734 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
|
3735 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3736 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
|
3737 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
|
3738 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3739 # 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
|
3740 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
|
3741 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
|
3742 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3743 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
|
3744 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
|
3745 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
|
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' % a))) |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3748 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
|
3749 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3750 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3751 def test_private_tags(self): |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3752 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3753 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
|
3754 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
|
3755 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
|
3756 |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3757 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3758 def test_findscu_encoding(self): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3759 # Check out ../Database/Encodings/Generate.sh |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3760 TEST = u'Test-éüäöòДΘĝדصķћ๛ﾈİ' |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3761 ENCODINGS = { |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3762 'Arabic' : [ 'ISO_IR 127' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3763 'Ascii' : [ 'ISO_IR 6' ], # More accurately, ISO 646 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3764 'Cyrillic' : [ 'ISO_IR 144' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3765 'Greek' : [ 'ISO_IR 126' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3766 'Hebrew' : [ 'ISO_IR 138' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3767 'Japanese' : [ 'ISO_IR 13', 'shift-jis' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3768 'Latin1' : [ 'ISO_IR 100' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3769 'Latin2' : [ 'ISO_IR 101' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3770 'Latin3' : [ 'ISO_IR 109' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3771 'Latin4' : [ 'ISO_IR 110' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3772 'Latin5' : [ 'ISO_IR 148' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3773 'Thai' : [ 'ISO_IR 166', 'tis-620' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3774 'Utf8' : [ 'ISO_IR 192' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3775 } |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3776 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3777 for name in ENCODINGS.iterkeys(): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3778 if len(ENCODINGS[name]) == 1: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3779 ENCODINGS[name].append(name.lower()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3780 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3781 UploadInstance(_REMOTE, 'Encodings/Lena-utf8.dcm') |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3782 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3783 for name in ENCODINGS.iterkeys(): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3784 self.assertEqual(name, DoPut(_REMOTE, '/tools/default-encoding', name)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3785 self.assertEqual(name, DoGet(_REMOTE, '/tools/default-encoding')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3786 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3787 i = CallFindScu([ '-k', '0008,0052=STUDY', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3788 '-k', 'SpecificCharacterSet', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3789 '-k', 'PatientName' ]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3790 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3791 characterSet = re.findall('\(0008,0005\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3792 self.assertEqual(1, len(characterSet)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3793 self.assertEqual(ENCODINGS[name][0], characterSet[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3794 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3795 patientName = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3796 self.assertEqual(1, len(patientName)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3797 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3798 expected = TEST.encode(ENCODINGS[name][1], 'ignore') |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3799 self.assertEqual(expected, patientName[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3800 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3801 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3802 #for master in ENCODINGS: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3803 for master in [ 'Latin1', 'Utf8', 'Cyrillic' ]: # Shortcut to speedup tests |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3804 self.assertEqual(master, DoPut(_REMOTE, '/tools/default-encoding', master)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3805 self.assertEqual(master, DoGet(_REMOTE, '/tools/default-encoding')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3806 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3807 for name in ENCODINGS: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3808 DropOrthanc(_REMOTE) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3809 UploadInstance(_REMOTE, 'Encodings/Lena-%s.dcm' % ENCODINGS[name][1]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3810 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3811 i = CallFindScu([ '-k', '0008,0052=STUDY', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3812 '-k', 'PatientID', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3813 '-k', 'SpecificCharacterSet', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3814 '-k', 'PatientName' ]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3815 i = i.decode(ENCODINGS[master][1]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3816 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3817 characterSet = re.findall('\(0008,0005\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3818 self.assertEqual(1, len(characterSet)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3819 self.assertEqual(ENCODINGS[master][0], characterSet[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3820 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3821 patientId = re.findall('\(0010,0020\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3822 self.assertEqual(1, len(patientId)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3823 self.assertEqual(ENCODINGS[name][1], patientId[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3824 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3825 patientName = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3826 self.assertEqual(1, len(patientName)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3827 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3828 tmp = ENCODINGS[name][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3829 expected = TEST.encode(tmp, 'ignore').decode(tmp) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3830 tmp = ENCODINGS[master][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3831 expected = expected.encode(tmp, 'ignore').decode(tmp) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3832 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3833 self.assertEqual(expected, patientName[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3834 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3835 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3836 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True, |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3837 'Level' : 'Study', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3838 'Query' : { }}) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3839 self.assertEqual(1, len(a)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3840 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3841 tmp = ENCODINGS[name][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3842 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
|
3843 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3844 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3845 def test_reconstruct(self): |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3846 def CompareMainDicomTag(expected, instance, level, tag): |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3847 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
|
3848 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3849 a = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3850 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3851 studies = DoGet(_REMOTE, '/studies/') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3852 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3853 self.assertEqual(1, len(studies)) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3854 self.assertEqual(1, len(DoGet(_REMOTE, '/series/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3855 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3856 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3857 modified = DoPost(_REMOTE, '/studies/%s/modify' % studies[0], { |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3858 "Replace" : { |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3859 "StudyDescription" : "hello", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3860 "SeriesDescription" : "world", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3861 "SOPClassUID" : "test", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3862 "SOPInstanceUID" : "myid", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3863 }, |
| 119 | 3864 "Keep" : [ "StudyInstanceUID", "SeriesInstanceUID" ], |
| 3865 "Force" : True | |
|
96
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3866 }) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3867 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3868 instances = DoGet(_REMOTE, '/instances/') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3869 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3870 self.assertEqual(1, len(DoGet(_REMOTE, '/studies/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3871 self.assertEqual(1, len(DoGet(_REMOTE, '/series/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3872 self.assertEqual(2, len(instances)) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3873 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3874 b = instances[0] if instances[1] == a else instances[1] |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3875 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3876 CompareMainDicomTag('Knee (R)', a, 'study', 'StudyDescription') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3877 CompareMainDicomTag('AX. FSE PD', a, 'series', 'SeriesDescription') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3878 CompareMainDicomTag('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a, '', 'SOPInstanceUID') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3879 CompareMainDicomTag('myid', b, '', 'SOPInstanceUID') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3880 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % a).strip()) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3881 self.assertEqual('test', DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % b).strip()) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3882 |
|
473
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3883 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3884 # metadata before reconstruct |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3885 mba = DoGet(_REMOTE, '/instances/%s/metadata?expand' % a) |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3886 mbb = DoGet(_REMOTE, '/instances/%s/metadata?expand' % a) |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3887 |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3888 # reconstruct by taking the new instance as the reference -> should repopulate study fields from this instance tags |
|
96
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3889 DoPost(_REMOTE, '/instances/%s/reconstruct' % b, {}) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3890 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3891 CompareMainDicomTag('hello', a, 'study', 'StudyDescription') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3892 CompareMainDicomTag('world', a, 'series', 'SeriesDescription') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3893 CompareMainDicomTag('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a, '', 'SOPInstanceUID') |
| 102 | 3894 |
|
473
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3895 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3896 # metadata after reconstruct should have been preserved |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3897 maa = DoGet(_REMOTE, '/instances/%s/metadata?expand' % a) |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3898 mab = DoGet(_REMOTE, '/instances/%s/metadata?expand' % a) |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3899 |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3900 self.assertEqual(mba, maa) |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3901 self.assertEqual(mbb, mab) |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3902 |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3903 |
| 104 | 3904 def test_httpClient_lua(self): |
| 496 | 3905 retries = 4 |
|
463
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
3906 result = '' |
|
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
3907 |
| 104 | 3908 with open(GetDatabasePath('Lua/HttpClient.lua'), 'r') as f: |
| 496 | 3909 scriptContent = f.read() |
|
463
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
3910 # 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
|
3911 while retries > 0 and not ('OK' in result): |
| 496 | 3912 print("Executing lua script HttpClient.lua") |
| 3913 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
|
3914 retries -= 1 |
| 102 | 3915 |
| 3916 self.assertIn('OK', result) | |
|
107
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3917 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3918 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3919 def test_bitbucket_issue_44(self): |
| 319 | 3920 # 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
|
3921 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3922 UploadInstance(_REMOTE, 'Issue44/Monochrome2.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3923 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3924 # dcmcjpeg +ua +eb Monochrome1.dcm Monochrome1-Jpeg.dcm |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3925 UploadInstance(_REMOTE, 'Issue44/Monochrome1-Jpeg.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3926 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3927 # dcmcjpeg +ua Monochrome1.dcm Monochrome1-JpegLS.dcm |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3928 UploadInstance(_REMOTE, 'Issue44/Monochrome1-JpegLS.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3929 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3930 monochrome1 = 'bcdd600a-a6a9c522-5f0a6e84-8657c9f3-b76e59b7' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3931 monochrome1_jpeg = '9df82121-208a2da8-0038674a-3d7a773b-b7008cd2' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3932 monochrome1_jpegls = '0486d1a2-9165573f-b1976b20-e927b016-6b8d67ab' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3933 monochrome2 = 'f00947b7-f61f7164-c93414d1-c6fbda6a-9e92ed20' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3934 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3935 for i in [ monochrome1, monochrome1_jpeg, monochrome1_jpegls ]: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3936 im = GetImage(_REMOTE, '/instances/%s/preview' % i) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3937 self.assertEqual("L", im.mode) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3938 self.assertEqual(2010, im.size[0]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3939 self.assertEqual(2446, im.size[1]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3940 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3941 # 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
|
3942 # white (255), should be rendered as black (0) => invert |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3943 if i == monochrome1_jpeg: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3944 # Add some tolerance because of JPEG destructive compression |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3945 self.assertGreater(10, im.getpixel((0,0))) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3946 else: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3947 self.assertEqual(0, im.getpixel((0,0))) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3948 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3949 im = GetImage(_REMOTE, '/instances/%s/preview' % monochrome2) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3950 self.assertEqual("L", im.mode) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3951 self.assertEqual(1572, im.size[0]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3952 self.assertEqual(2010, im.size[1]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3953 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3954 # 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
|
3955 # white (255), should be rendered as white (255) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3956 self.assertEqual(255, im.getpixel((0,0))) |
|
111
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3957 |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3958 |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3959 def test_bitbucket_issue_42(self): |
| 319 | 3960 # https://bugs.orthanc-server.com/show_bug.cgi?id=42 |
| 123 | 3961 # 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
|
3962 UploadInstance(_REMOTE, 'Issue42.dcm')['ID'] |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3963 modified = DoPost(_REMOTE, |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3964 '/patients/da128605-e040d0c4-310615d2-3475da63-df2d1ef4/modify', |
| 119 | 3965 '{"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
|
3966 'application/json') |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3967 self.assertTrue('PatientID' in modified) |
|
113
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3968 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3969 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3970 def test_rest_find_limit(self): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3971 # Check the "Since" and "Limit" parameters in URI "/tools/find" |
| 319 | 3972 # 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
|
3973 |
|
113
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3974 # Upload 6 instances |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3975 brainix = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3976 knee = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3977 for i in range(2): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3978 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
|
3979 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
|
3980 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
|
3981 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3982 # Check using BRAINIX |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3983 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3984 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3985 'Limit' : 10 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3986 self.assertEqual(4, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3987 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3988 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3989 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3990 'Limit' : 4 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3991 self.assertEqual(4, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3992 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3993 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3994 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3995 'Since' : 2, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3996 'Limit' : 4 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3997 self.assertEqual(2, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3998 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3999 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4000 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4001 'Limit' : 3 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4002 self.assertEqual(3, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4003 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4004 b = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4005 for i in range(4): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4006 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4007 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4008 'Limit' : 1, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4009 'Since' : i }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4010 self.assertEqual(1, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4011 b.append(a[0]) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4012 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4013 # 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
|
4014 self.assertEqual(0, len(set(b) ^ set(brainix))) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4015 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4016 # Check using KNEE |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4017 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4018 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4019 'Limit' : 10 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4020 self.assertEqual(2, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4021 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4022 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4023 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4024 'Limit' : 2 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4025 self.assertEqual(2, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4026 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4027 b = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4028 for i in range(2): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4029 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4030 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4031 'Limit' : 1, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4032 'Since' : i }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4033 self.assertEqual(1, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4034 b.append(a[0]) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4035 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4036 self.assertEqual(0, len(set(b) ^ set(knee))) |
|
115
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4037 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4038 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4039 def test_bitbucket_issue_46(self): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4040 # "PHI remaining after anonymization" |
| 319 | 4041 # 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
|
4042 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4043 def GetAnonymizedTags(study, version): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4044 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4045 { 'DicomVersion' : version }, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4046 'application/json') ['ID'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4047 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4048 self.assertEqual(1, len(a)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4049 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4050 instance = a[0]['ID'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4051 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4052 return (instance, DoGet(_REMOTE, '/instances/%s/tags' % instance)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4053 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4054 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm') |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4055 origStudy = '6068a14b-d4df27af-9ec22145-538772d8-74f228ff' |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4056 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4057 # 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
|
4058 # (Patient's Mother's Birth Name) tags |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4059 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4060 '{"Replace":{"0010,1060":"OSIMIS","0032,1033":"MOTHER"}}', |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4061 'application/json')['ID'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4062 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4063 # 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
|
4064 # 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
|
4065 (instance, tags) = GetAnonymizedTags(newStudy, "2008") |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4066 self.assertTrue('0032,1033' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4067 self.assertTrue('0010,1060' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4068 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4069 # 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
|
4070 # 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
|
4071 (instance, tags) = GetAnonymizedTags(newStudy, "2017c") |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4072 self.assertFalse('0032,1033' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4073 self.assertFalse('0010,1060' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4074 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4075 t = {} |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4076 for (key, value) in tags.iteritems(): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4077 t[value['Name']] = value['Value'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4078 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4079 self.assertEqual('', t['StudyDate']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4080 self.assertEqual('', t['StudyTime']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4081 self.assertEqual('', t['PatientSex']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4082 self.assertFalse('SeriesDate' in t) # Type 3 tag => null |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4083 self.assertFalse('SeriesTime' in t) # Type 3 tag => null |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4084 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4085 with tempfile.NamedTemporaryFile(delete = True) as f: |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4086 # 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
|
4087 f.write(DoGet(_REMOTE, '/instances/%s/file' % instance)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4088 f.flush() |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4089 subprocess.check_output([ FindExecutable('dciodvfy'), f.name ], |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4090 stderr = subprocess.STDOUT).split('\n') |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4091 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4092 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4093 def test_bitbucket_issue_55(self): |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4094 def Run(modify, query): |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4095 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4096 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4097 operation = 'modify' if modify else 'anonymize' |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4098 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4099 self.assertRaises(Exception, lambda: DoPost( |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4100 _REMOTE, '/studies/%s/%s' % (study, operation), query)) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4101 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4102 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4103 query["Force"] = True |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4104 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
|
4105 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4106 DoDelete(_REMOTE, a) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4107 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4108 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4109 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4110 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4111 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4112 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4113 Run(True, { "Replace" : { "StudyInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4114 Run(True, { "Replace" : { "SeriesInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4115 Run(True, { "Replace" : { "SOPInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4116 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4117 Run(False, { "Keep" : [ "StudyInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4118 Run(False, { "Keep" : [ "SeriesInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4119 Run(False, { "Keep" : [ "SOPInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4120 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4121 Run(False, { "Replace" : { "StudyInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4122 Run(False, { "Replace" : { "SeriesInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4123 Run(False, { "Replace" : { "SOPInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4124 |
|
120
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4125 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4126 def test_bitbucket_issue_56(self): |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4127 # Case-insensitive matching over accents. This test assumes |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4128 # that the "CaseSensitivePN" configuration option of Orthanc |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4129 # is set to "false" (default value). |
| 319 | 4130 # 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
|
4131 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4132 def Check(name, expected, expectedSensitive): |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4133 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
|
4134 '-k', '0008,0052=PATIENT', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4135 '-k', 'PatientName=%s' % name ]) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4136 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', a) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4137 self.assertEqual(expected, len(patientNames)) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4138 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4139 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4140 'CaseSensitive' : False, |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4141 'Query' : { 'PatientName' : name }}) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4142 self.assertEqual(expected, len(a)) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4143 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4144 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4145 'CaseSensitive' : True, |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4146 'Query' : { 'PatientName' : name }}) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4147 self.assertEqual(expectedSensitive, len(a)) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4148 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4149 UploadInstance(_REMOTE, 'Encodings/Lena-latin1.dcm') |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4150 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4151 # WildcardConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4152 Check('TeSt*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4153 Check('TeSt-a*', 0, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4154 Check('TeSt-É*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4155 Check('TeSt-é*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4156 Check('Test-é*', 1, 1) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4157 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4158 # ListConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4159 Check('Test-éüäöò\\nope', 1, 1) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4160 Check('Test-ÉÜÄÖÒ\\nope', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4161 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4162 # ValueConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4163 Check('Test-éüäöò', 1, 1) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4164 Check('Test-ÉÜÄÖÒ', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4165 |
| 125 | 4166 |
| 4167 def test_gbk_alias(self): | |
| 4168 # https://groups.google.com/d/msg/orthanc-users/WMM8LMbjpUc/02-1f_yFCgAJ | |
| 4169 # This test fails on Orthanc <= 1.3.0 | |
| 4170 i = UploadInstance(_REMOTE, '2017-09-19-GBK-Tumashu.dcm')['ID'] | |
| 4171 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) | |
| 4172 self.assertEqual(tags['PatientName'], u'徐浩凯') | |
| 4173 self.assertEqual(tags['InstitutionName'], u'灌云县疾病预防控制中心') | |
| 126 | 4174 |
| 4175 | |
| 4176 def test_long_tag(self): | |
| 4177 i = UploadInstance(_REMOTE, 'DummyCTWithLongTag.dcm')['ID'] | |
| 4178 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 4179 | |
| 4180 tags = DoGet(_REMOTE, '/instances/%s/tags' % i) | |
| 4181 self.assertTrue('0018,1020' in tags) | |
| 4182 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name']) | |
| 4183 self.assertEqual('TooLong', tags['0018,1020']['Type']) | |
| 4184 self.assertEqual(None, tags['0018,1020']['Value']) | |
| 4185 | |
| 4186 tags = DoGet(_REMOTE, '/instances/%s/tags?ignore-length=0018-1020' % i) | |
| 4187 self.assertTrue('0018,1020' in tags) | |
| 4188 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name']) | |
| 4189 self.assertEqual('String', tags['0018,1020']['Type']) | |
| 4190 self.assertTrue(tags['0018,1020']['Value'].startswith('Lorem ipsum dolor sit amet')) | |
| 4191 | |
| 4192 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) | |
| 4193 self.assertTrue('SoftwareVersions' in tags) | |
| 4194 self.assertEqual(None, tags['SoftwareVersions']) | |
| 4195 self.assertTrue('HeartRate' in tags) | |
| 4196 self.assertEqual(474, int(tags['HeartRate'])) | |
| 4197 | |
| 4198 tags = DoGet(_REMOTE, '/instances/%s/simplified-tags' % i) | |
| 4199 self.assertTrue('SoftwareVersions' in tags) | |
| 4200 self.assertEqual(None, tags['SoftwareVersions']) | |
| 4201 | |
| 4202 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify&ignore-length=0018-1020' % i) | |
| 4203 self.assertTrue('SoftwareVersions' in tags) | |
| 4204 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet')) | |
| 4205 | |
| 4206 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify&ignore-length=SoftwareVersions' % i) | |
| 4207 self.assertTrue('SoftwareVersions' in tags) | |
| 4208 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet')) | |
| 4209 | |
| 4210 tags = DoGet(_REMOTE, '/series/%s/instances-tags' % series) | |
| 4211 self.assertEqual(1, len(tags)) | |
| 4212 self.assertTrue(i in tags.keys()) | |
| 4213 self.assertTrue('0018,1020' in tags[i]) | |
| 4214 self.assertEqual('TooLong', tags[i]['0018,1020']['Type']) | |
| 4215 | |
| 4216 tags = DoGet(_REMOTE, '/series/%s/instances-tags?ignore-length=SoftwareVersions' % series) | |
| 4217 self.assertEqual(1, len(tags)) | |
| 4218 self.assertTrue(i in tags.keys()) | |
| 4219 self.assertTrue('0018,1020' in tags[i]) | |
| 4220 self.assertEqual('String', tags[i]['0018,1020']['Type']) | |
| 4221 self.assertTrue(tags[i]['0018,1020']['Value'].startswith('Lorem ipsum dolor sit amet')) | |
| 4222 | |
|
127
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4223 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4224 def test_extended_media(self): |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4225 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4226 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4227 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
|
4228 self.assertEqual(2, len(z.namelist())) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4229 self.assertTrue('IMAGES/IM0' in z.namelist()) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4230 self.assertTrue('DICOMDIR' in z.namelist()) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4231 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4232 try: |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4233 os.remove('/tmp/DICOMDIR') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4234 except: |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4235 # The file does not exist |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4236 pass |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4237 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4238 z.extract('DICOMDIR', '/tmp') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4239 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ], |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4240 stderr = subprocess.STDOUT).split('\n') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4241 self.assertEqual(5, len(a)) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4242 self.assertTrue(a[0].startswith('Warning')) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4243 self.assertEqual('BasicDirectory', a[1]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4244 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
|
4245 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
|
4246 self.assertEqual('', a[4]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4247 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4248 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ], |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4249 stderr = subprocess.STDOUT).split('\n') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4250 self.assertEqual(1, len(a)) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4251 self.assertEqual('', a[0]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4252 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4253 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4254 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
|
4255 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4256 # Check the presence of the series description (extended tag) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4257 self.assertTrue(re.search('T1W_aTSE', a) != None) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4258 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4259 os.remove('/tmp/DICOMDIR') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4260 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4261 |
|
132
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4262 def test_anonymize_relationships_1(self): |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4263 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4264 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
|
4265 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4266 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4267 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4268 '{}', |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4269 'application/json')['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4270 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4271 a = DoGet(_REMOTE, '/studies/%s/instances' % study) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4272 self.assertEqual(2, len(a)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4273 a1 = a[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4274 a2 = a[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4275 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4276 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4277 self.assertEqual(2, len(b)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4278 b1 = b[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4279 b2 = b[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4280 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4281 SEQUENCE = '/instances/%s/content/ReferencedImageSequence' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4282 SOP = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPInstanceUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4283 CLASS = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPClassUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4284 FRAME = '/instances/%s/content/FrameOfReferenceUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4285 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4286 self.assertEqual(DoGet(_REMOTE, FRAME % a1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4287 DoGet(_REMOTE, FRAME % a2)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4288 self.assertEqual(DoGet(_REMOTE, FRAME % b1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4289 DoGet(_REMOTE, FRAME % b2)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4290 self.assertNotEqual(DoGet(_REMOTE, FRAME % a1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4291 DoGet(_REMOTE, FRAME % b1)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4292 self.assertNotEqual(DoGet(_REMOTE, FRAME % a2), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4293 DoGet(_REMOTE, FRAME % b2)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4294 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4295 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
|
4296 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
|
4297 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
|
4298 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
|
4299 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4300 for i in range(3): |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4301 self.assertEqual(DoGet(_REMOTE, SOP % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4302 DoGet(_REMOTE, SOP % (a2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4303 self.assertEqual(DoGet(_REMOTE, SOP % (b1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4304 DoGet(_REMOTE, SOP % (b2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4305 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4306 DoGet(_REMOTE, SOP % (b1, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4307 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4308 DoGet(_REMOTE, SOP % (b2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4309 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4310 DoGet(_REMOTE, CLASS % (b1, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4311 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4312 DoGet(_REMOTE, CLASS % (b2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4313 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4314 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4315 def test_anonymize_relationships_2(self): |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4316 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm') |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4317 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
|
4318 study = '6c65289b-db2fcb71-7eaf73f4-8e12470c-a4d6d7cf' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4319 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4320 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4321 '{}', |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4322 'application/json')['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4323 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4324 a = DoGet(_REMOTE, '/studies/%s/instances' % study) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4325 self.assertEqual(2, len(a)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4326 a1 = a[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4327 a2 = a[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4328 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4329 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4330 self.assertEqual(2, len(b)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4331 b1 = b[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4332 b2 = b[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4333 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4334 SEQUENCE = '/instances/%s/content/SourceImageSequence' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4335 SOP = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPInstanceUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4336 CLASS = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPClassUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4337 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4338 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
|
4339 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
|
4340 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
|
4341 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
|
4342 self.assertEqual(DoGet(_REMOTE, SOP % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4343 DoGet(_REMOTE, SOP % (a2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4344 self.assertEqual(DoGet(_REMOTE, SOP % (b1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4345 DoGet(_REMOTE, SOP % (b2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4346 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4347 DoGet(_REMOTE, SOP % (b1, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4348 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4349 DoGet(_REMOTE, SOP % (b2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4350 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4351 DoGet(_REMOTE, CLASS % (b1, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4352 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4353 DoGet(_REMOTE, CLASS % (b2, 0))) |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4354 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4355 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4356 def test_anonymize_relationships_3(self): |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4357 sr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM0')['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4358 mr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM631')['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4359 study = 'ef351eb2-c1147229-062736b8-35a151e3-e32d526b' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4360 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4361 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4362 { "Keep" : [ "ContentSequence" ] }) ['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4363 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4364 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4365 self.assertEqual(2, len(a)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4366 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4367 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
|
4368 sr2 = a[0]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4369 mr2 = a[1]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4370 else: |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4371 sr2 = a[1]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4372 mr2 = a[0]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4373 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4374 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % sr1), |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4375 DoGet(_REMOTE, '/instances/%s/content/Modality' % sr2)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4376 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % mr1), |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4377 DoGet(_REMOTE, '/instances/%s/content/Modality' % mr2)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4378 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4379 mrUid1 = DoGet(_REMOTE, '/instances/%s' % mr1)['MainDicomTags']['SOPInstanceUID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4380 mrUid2 = DoGet(_REMOTE, '/instances/%s' % mr2)['MainDicomTags']['SOPInstanceUID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4381 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
|
4382 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
|
4383 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
|
4384 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
|
4385 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4386 PATH1 = '/instances/%s/content/CurrentRequestedProcedureEvidenceSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4387 PATH2 = PATH1 + '/0/ReferencedSeriesSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4388 PATH3 = PATH2 + '/0/ReferencedSOPSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4389 PATH4 = PATH3 + '/0/ReferencedSOPInstanceUID' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4390 PATH5 = PATH3 + '/0/ReferencedSOPClassUID' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4391 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4392 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4393 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4394 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4395 self.assertEqual(DoGet(_REMOTE, PATH4 % sr1), mrUid1) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4396 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
|
4397 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
|
4398 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4399 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4400 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4401 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4402 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
|
4403 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4404 self.assertEqual(mrUid2, DoGet(_REMOTE, PATH4 % sr2).strip('\x00')) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4405 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
|
4406 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
|
4407 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4408 content1 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr1) ['ContentSequence'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4409 content2 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr2) ['ContentSequence'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4410 self.assertEqual(str(content1), str(content2)) |
|
141
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4411 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4412 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4413 def test_bitbucket_issue_94(self): |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4414 # "a simple instance modification should not modify FrameOfReferenceUID + ..." |
| 319 | 4415 # 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
|
4416 i = UploadInstance(_REMOTE, 'Issue94.dcm')['ID'] |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4417 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4418 source = DoGet(_REMOTE, '/instances/%s/attachments/dicom/data' % i) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4419 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4420 modified = DoPost(_REMOTE, '/instances/%s/modify' % i, |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4421 { "Replace" : {"PatientID" : "toto"}, "Force": True}) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4422 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4423 anonymized = DoPost(_REMOTE, '/instances/%s/anonymize' % i) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4424 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4425 a = ExtractDicomTags(source, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4426 self.assertEqual(1, len(a)) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4427 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4428 b = ExtractDicomTags(modified, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4429 self.assertEqual(1, len(b)) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4430 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4431 c = ExtractDicomTags(anonymized, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4432 self.assertEqual(1, len(c)) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4433 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4434 self.assertEqual(a, b) # Modified DICOM |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4435 self.assertNotEqual(a, c) # Anonymized DICOM |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4436 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4437 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4438 def test_metadata_origin(self): |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4439 # Upload using the REST API |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4440 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
|
4441 self.assertEqual('RestApi', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4442 self.assertEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4443 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4444 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/metadata/CalledAET' % i)) |
| 315 | 4445 |
| 4446 # "HttpUsername" is empty iff "AuthenticationEnabled" is "false" | |
| 4447 self.assertTrue(DoGet(_REMOTE, '/instances/%s/metadata/HttpUsername' % i) in [ '', 'alice' ]) | |
| 4448 | |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4449 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4450 self.assertEqual('RestApi', m['Origin']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4451 self.assertEqual('', m['RemoteAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4452 self.assertNotEqual('', m['RemoteIP']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4453 self.assertFalse('CalledAET' in m) |
| 315 | 4454 self.assertTrue('HttpUsername' in m) |
| 4455 self.assertTrue(m['HttpUsername'] in [ '', 'alice' ]) | |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4456 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4457 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
|
4458 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
|
4459 self.assertEqual('1', m['IndexInSeries']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4460 self.assertTrue('ReceptionDate' in m) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4461 |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4462 DoDelete(_REMOTE, '/instances/%s' % i) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4463 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4464 # Upload using the DICOM protocol |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4465 subprocess.check_call([ FindExecutable('storescu'), |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4466 _REMOTE['Server'], str(_REMOTE['DicomPort']), |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4467 GetDatabasePath('Knee/T1/IM-0001-0001.dcm'), |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4468 '-xw' ]) # Propose JPEG2000 |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4469 self.assertEqual('DicomProtocol', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4470 self.assertEqual('STORESCU', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4471 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4472 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
|
4473 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
|
4474 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4475 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4476 self.assertEqual('DicomProtocol', m['Origin']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4477 self.assertEqual('STORESCU', m['RemoteAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4478 self.assertNotEqual('', m['RemoteIP']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4479 self.assertEqual('ANY-SCP', m['CalledAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4480 self.assertFalse('HttpUsername' in m) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4481 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4482 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
|
4483 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
|
4484 self.assertEqual('1', m['IndexInSeries']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4485 self.assertTrue('ReceptionDate' in m) |
| 147 | 4486 |
| 4487 | |
| 4488 def test_lua_deadlock(self): | |
| 4489 # Rana Asim Wajid (2018-07-14): "It does seem that the issue | |
| 4490 # is with the lua script I'm using for conversion of images to | |
| 4491 # JPEG2000. When the script is used with 1.4.0 the first | |
| 4492 # instance appears to be stored and then everything just | |
| 4493 # halts, ie Orthanc wont respond to anything after that." | |
| 4494 # https://groups.google.com/d/msg/orthanc-users/Rc-Beb42xc8/JUgdzrmCAgAJ | |
| 174 | 4495 InstallLuaScriptFromPath(_REMOTE, 'Lua/Jpeg2000Conversion.lua') |
| 147 | 4496 |
| 4497 subprocess.check_call([ FindExecutable('storescu'), | |
| 4498 _REMOTE['Server'], str(_REMOTE['DicomPort']), | |
| 4499 GetDatabasePath('Brainix/Flair/IM-0001-0001.dcm'), | |
| 4500 GetDatabasePath('Brainix/Flair/IM-0001-0002.dcm'), | |
| 4501 ]) | |
| 4502 | |
| 4503 instances = DoGet(_REMOTE, '/instances') | |
| 4504 self.assertEqual(2, len(instances)) | |
| 4505 | |
| 4506 t1 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[0]) | |
| 4507 t2 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[1]) | |
| 175 | 4508 self.assertEqual('1.2.840.10008.1.2.4.90', t1) # this will fail if libgdcm-tools is not installed |
| 147 | 4509 self.assertEqual(t1, t2); |
|
154
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4510 |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4511 |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4512 def test_find_group_length(self): |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4513 # 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
|
4514 # one of the Generic Group Length tags (*, 0x0000) |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4515 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
|
4516 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
|
4517 self.assertFalse('UnableToProcess' in result) |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4518 self.assertFalse('E:' in result) |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4519 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4520 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4521 def test_split(self): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4522 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4523 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
|
4524 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
|
4525 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
|
4526 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4527 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4528 t2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4529 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4530 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4531 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4532 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4533 info = DoGet(_REMOTE, '/studies/%s' % study) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4534 self.assertTrue('ReferringPhysicianName' in info['MainDicomTags']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4535 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4536 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4537 (_REMOTE, '/studies/%s/split' % study, { |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4538 'Series' : [ t2 ], |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4539 'Replace' : { 'PatientName' : 'Hello' }, |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4540 'Remove' : [ 'ReferringPhysicianName' ], |
| 181 | 4541 'KeepSource' : False, |
| 4542 'Asynchronous' : True | |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4543 })) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4544 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4545 self.assertNotEqual(None, job) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4546 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4547 studies = set(DoGet(_REMOTE, '/studies')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4548 self.assertEqual(2, len(studies)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4549 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4550 series = set(DoGet(_REMOTE, '/series')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4551 self.assertEqual(2, len(series)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4552 self.assertTrue(t1 in series) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4553 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4554 study2 = DoGet(_REMOTE, '/jobs/%s' % job)['Content']['TargetStudy'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4555 self.assertTrue(study in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4556 self.assertTrue(study2 in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4557 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4558 info = DoGet(_REMOTE, '/studies/%s' % study2) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4559 self.assertTrue('Hello', info['PatientMainDicomTags']['PatientName']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4560 self.assertFalse('ReferringPhysicianName' in info['MainDicomTags']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4561 |
|
254
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4562 sopInstanceUids = set() |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4563 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
|
4564 sopInstanceUids.add(i['MainDicomTags']['SOPInstanceUID']) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4565 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4566 self.assertTrue(knee1Sop in sopInstanceUids) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4567 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4568 # Fails if Orthanc <= 1.5.7 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4569 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
|
4570 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4571 # 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
|
4572 self.assertEqual(2, len(sopInstanceUids)) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4573 |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4574 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4575 def test_merge(self): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4576 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
|
4577 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
|
4578 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
|
4579 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
|
4580 knee = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4581 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4582 brainix = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4583 flair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4584 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4585 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4586 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4587 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4588 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4589 (_REMOTE, '/studies/%s/merge' % knee, { |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4590 'Resources' : [ brainix ], |
| 181 | 4591 'KeepSource' : True, |
| 4592 'Synchronous' : False | |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4593 })) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4594 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4595 self.assertNotEqual(None, job) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4596 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4597 studies = set(DoGet(_REMOTE, '/studies')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4598 self.assertEqual(2, len(studies)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4599 self.assertTrue(knee in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4600 self.assertTrue(brainix in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4601 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4602 series = set(DoGet(_REMOTE, '/studies/%s' % knee)['Series']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4603 self.assertTrue(t1 in series) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4604 series.remove(t1) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4605 self.assertEqual(1, len(series)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4606 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4607 instances = DoGet(_REMOTE, '/series/%s' % list(series)[0])['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4608 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4609 merged = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4610 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4611 instances = DoGet(_REMOTE, '/series/%s' % t1)['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4612 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4613 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
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 instances = DoGet(_REMOTE, '/series/%s' % flair)['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4616 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4617 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4618 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4619 tags = DoGet(_REMOTE, '/studies/%s' % knee) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4620 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4621 for key in tags['PatientMainDicomTags']: |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4622 self.assertEqual(a[key], merged[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4623 if (key in b and key != 'PatientSex'): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4624 self.assertNotEqual(a[key], b[key]) |
|
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 for key in tags['MainDicomTags']: |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4627 # Not in the patient/study module |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4628 if (not key in [ 'InstitutionName', |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4629 'RequestingPhysician', |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4630 'RequestedProcedureDescription', ]): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4631 self.assertEqual(a[key], merged[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4632 if (key in b): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4633 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
|
4634 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4635 sopInstanceUids = set() |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4636 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
|
4637 sopInstanceUids.add(i['MainDicomTags']['SOPInstanceUID']) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4638 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4639 self.assertTrue(kneeSop in sopInstanceUids) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4640 self.assertTrue(brainixSop in sopInstanceUids) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4641 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4642 # Fails if Orthanc <= 1.5.7 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4643 # 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
|
4644 self.assertEqual(3, len(sopInstanceUids)) |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4645 |
| 187 | 4646 |
| 4647 def test_async_archive(self): | |
| 4648 # Testing the asynchronous generation of archives/medias (new | |
| 4649 # in Orthanc 1.4.3) | |
| 4650 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 4651 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 4652 | |
| 4653 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' | |
| 4654 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' | |
| 4655 | |
| 4656 job = MonitorJob2(_REMOTE, lambda: DoPost | |
| 4657 (_REMOTE, '/studies/%s/archive' % kneeT1, { | |
| 4658 'Synchronous' : False | |
| 4659 })) | |
| 4660 | |
| 4661 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) | |
| 4662 self.assertEqual(1, len(z.namelist())) | |
| 4663 self.assertFalse('DICOMDIR' in z.namelist()) | |
| 4664 | |
|
354
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4665 info = DoGet(_REMOTE, '/jobs/%s' % job) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4666 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
|
4667 self.assertEqual(1, info['Content']['InstancesCount']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4668 self.assertEqual(0, info['Content']['UncompressedSizeMB']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4669 |
| 187 | 4670 job2 = MonitorJob2(_REMOTE, lambda: DoPost |
| 4671 (_REMOTE, '/studies/%s/media' % kneeT1, { | |
| 4672 'Synchronous' : False | |
| 4673 })) | |
| 4674 | |
| 4675 # The archive from the first job has been replaced by the | |
| 4676 # archive from second job (as MediaArchiveSize == 1) | |
| 4677 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job)) | |
| 4678 | |
| 4679 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job2) | |
| 4680 self.assertEqual(2, len(z.namelist())) | |
| 4681 self.assertTrue('DICOMDIR' in z.namelist()) | |
| 4682 | |
|
354
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4683 info = DoGet(_REMOTE, '/jobs/%s' % job2) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4684 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
|
4685 self.assertEqual(1, info['Content']['InstancesCount']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4686 self.assertEqual(0, info['Content']['UncompressedSizeMB']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4687 |
| 187 | 4688 job = MonitorJob2(_REMOTE, lambda: DoPost |
| 4689 (_REMOTE, '/tools/create-archive', { | |
| 4690 'Synchronous' : False, | |
| 4691 'Resources' : [ kneeT1, kneeT2 ], | |
| 4692 })) | |
| 4693 | |
| 4694 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) | |
| 4695 self.assertEqual(2, len(z.namelist())) | |
| 4696 self.assertFalse('DICOMDIR' in z.namelist()) | |
| 4697 | |
|
354
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4698 info = DoGet(_REMOTE, '/jobs/%s' % job) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4699 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
|
4700 self.assertEqual(2, info['Content']['InstancesCount']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4701 self.assertEqual(0, info['Content']['UncompressedSizeMB']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4702 |
| 187 | 4703 job = MonitorJob2(_REMOTE, lambda: DoPost |
| 4704 (_REMOTE, '/tools/create-media', { | |
| 4705 'Synchronous' : False, | |
| 4706 'Resources' : [ kneeT1, kneeT2 ], | |
| 4707 })) | |
| 4708 | |
| 4709 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) | |
| 4710 self.assertEqual(3, len(z.namelist())) | |
| 4711 self.assertTrue('DICOMDIR' in z.namelist()) | |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4712 |
|
354
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4713 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
|
4714 self.assertEqual(2, info['Content']['InstancesCount']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4715 self.assertEqual(0, info['Content']['UncompressedSizeMB']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4716 |
| 187 | 4717 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4718 def test_queries_hierarchy(self): |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4719 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4720 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
|
4721 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4722 tags = { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4723 'NumberOfPatientRelatedInstances' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4724 'NumberOfPatientRelatedSeries' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4725 'NumberOfPatientRelatedStudies' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4726 'NumberOfStudyRelatedInstances' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4727 'NumberOfStudyRelatedSeries' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4728 'NumberOfSeriesRelatedInstances' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4729 } |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4730 |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4731 tags2 = copy.copy(tags) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4732 tags2['PatientID'] = '887' # Only consider the "Knee" patient |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4733 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4734 patient = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4735 'Level' : 'Patient', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4736 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4737 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4738 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4739 study = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4740 'Level' : 'Study', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4741 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4742 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4743 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4744 series = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4745 'Level' : 'Series', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4746 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4747 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4748 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4749 instance = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4750 'Level' : 'Instance', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4751 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4752 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4753 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4754 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
|
4755 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4756 self.assertEqual('887', p[0]['PatientID']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4757 self.assertEqual('1', p[0]['NumberOfPatientRelatedInstances']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4758 self.assertEqual('1', p[0]['NumberOfPatientRelatedSeries']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4759 self.assertEqual('1', p[0]['NumberOfPatientRelatedStudies']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4760 self.assertFalse('NumberOfStudyRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4761 self.assertFalse('NumberOfStudyRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4762 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4763 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4764 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
|
4765 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4766 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
|
4767 self.assertEqual('1', p[0]['NumberOfStudyRelatedInstances']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4768 self.assertEqual('1', p[0]['NumberOfStudyRelatedSeries']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4769 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4770 self.assertFalse('NumberOfPatientRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4771 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4772 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4773 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4774 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
|
4775 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4776 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
|
4777 self.assertEqual('1', p[0]['NumberOfSeriesRelatedInstances']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4778 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4779 self.assertFalse('NumberOfPatientRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4780 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4781 self.assertFalse('NumberOfStudyRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4782 self.assertFalse('NumberOfStudyRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4783 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4784 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
|
4785 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4786 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
|
4787 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4788 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
|
4789 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4790 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
|
4791 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % study)) |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4792 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4793 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
|
4794 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4795 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
|
4796 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4797 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4798 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
|
4799 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4800 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
|
4801 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4802 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4803 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
|
4804 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4805 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
|
4806 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4807 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4808 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
|
4809 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4810 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
|
4811 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4812 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4813 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
|
4814 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4815 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
|
4816 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4817 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4818 |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4819 def test_dicom_disk_size(self): |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4820 dicomSize = 0 |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4821 |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4822 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
|
4823 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
|
4824 |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4825 for i in range(2): |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4826 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
|
4827 UploadInstance(_REMOTE, p) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4828 dicomSize += os.path.getsize(GetDatabasePath(p)) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4829 |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4830 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
|
4831 self.assertEqual(2, s['CountInstances']) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4832 self.assertEqual(2, s['CountSeries']) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4833 self.assertEqual(1, s['CountStudies']) |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4834 |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4835 self.assertEqual(dicomSize, int(s['DicomUncompressedSize'])) |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4836 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4837 if isCompressed: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4838 self.assertGreater(dicomSize, int(s['DicomDiskSize'])) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4839 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
|
4840 self.assertLess(dicomSize, int(s['UncompressedSize'])) |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4841 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4842 self.assertEqual(dicomSize, int(s['DicomDiskSize'])) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4843 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
|
4844 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
|
4845 if IsDicomUntilPixelDataStored(_REMOTE): |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4846 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
|
4847 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4848 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
|
4849 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4850 # 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
|
4851 # 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
|
4852 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
|
4853 |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4854 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4855 def test_changes_2(self): |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4856 # 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
|
4857 # 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
|
4858 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4859 # 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
|
4860 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
|
4861 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
|
4862 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
|
4863 DoDelete(_REMOTE, '/instances/%s' % a) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4864 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4865 # 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
|
4866 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
|
4867 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4868 c = DoGet(_REMOTE, '/changes') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4869 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
|
4870 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4871 seq = c['Last'] |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4872 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4873 c = DoGet(_REMOTE, '/changes?last') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4874 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
|
4875 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4876 self.assertEqual(seq, c['Last']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4877 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4878 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
|
4879 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
|
4880 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4881 self.assertEqual(seq, c['Last']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4882 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4883 # Add one instance |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4884 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4885 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
|
4886 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4887 c = DoGet(_REMOTE, '/changes') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4888 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
|
4889 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4890 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
|
4891 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4892 c = DoGet(_REMOTE, '/changes?last') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4893 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
|
4894 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4895 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
|
4896 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4897 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
|
4898 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
|
4899 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4900 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
|
4901 |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4902 # 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
|
4903 # changes of type "UpdatedMetadata" |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4904 i = DoGet(_REMOTE, '/instances') [0] |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4905 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
|
4906 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
4907 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/4000' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
4908 self.assertEqual('200', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
4909 self.assertEqual('hello', body) |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4910 |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4911 c = DoGet(_REMOTE, '/changes?last') |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4912 self.assertEqual(1, len(c['Changes'])) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4913 self.assertTrue(c['Done']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4914 self.assertEqual(seq + 5, c['Last']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4915 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4916 |
|
394
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4917 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2): |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4918 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i, headers = { |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4919 'If-Match' : headers['etag'] |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4920 }) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4921 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4922 self.assertFalse('etag' in headers) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4923 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4924 |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4925 c = DoGet(_REMOTE, '/changes?last') |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4926 self.assertEqual(1, len(c['Changes'])) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4927 self.assertTrue(c['Done']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4928 self.assertEqual(seq + 6, c['Last']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4929 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4930 |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4931 # Remove the uploaded instance |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4932 DoDelete(_REMOTE, '/instances/%s' % a) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4933 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
|
4934 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4935 c = DoGet(_REMOTE, '/changes') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4936 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
|
4937 self.assertTrue(c['Done']) |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4938 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
|
4939 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4940 c = DoGet(_REMOTE, '/changes?last') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4941 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
|
4942 self.assertTrue(c['Done']) |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4943 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
|
4944 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4945 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
|
4946 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
|
4947 self.assertTrue(c['Done']) |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4948 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
|
4949 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4950 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4951 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
|
4952 a = UploadInstance(_REMOTE, 'Issue124.dcm')['ID'] |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4953 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4954 z = GetArchive(_REMOTE, '/patients/%s/media' % a) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4955 self.assertEqual(2, len(z.namelist())) |
|
207
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4956 |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4957 |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4958 def test_invalid_findscp(self): |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4959 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4960 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
|
4961 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
|
4962 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4963 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4964 def test_bitbucket_issue_90(self): |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4965 def CountDicomResults(sex): |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4966 a = CallFindScu([ '-S', '-k', '8,52=STUDY', '-k', sex ]) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4967 return len(re.findall('\(0010,0040\)', a)) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4968 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4969 def CountRestResults(sex): |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4970 a = DoPost(_REMOTE, '/tools/find', |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4971 { 'Level' : 'Study', 'Query' : { 'PatientSex' : sex } }) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4972 return len(a) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4973 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4974 # 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
|
4975 # "DummyCT.dcm" has the tag PatientSex (0010,0040) unset |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4976 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4977 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4978 # 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
|
4979 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4980 # 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
|
4981 self.assertEqual(0, CountDicomResults('PatientSex=*')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4982 self.assertEqual(0, CountRestResults('*')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4983 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4984 # 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
|
4985 self.assertEqual(0, CountDicomResults('PatientSex=F')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4986 self.assertEqual(0, CountDicomResults('PatientSex=M')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4987 self.assertEqual(0, CountRestResults('F')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4988 self.assertEqual(0, CountRestResults('M')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4989 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4990 # 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
|
4991 # 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
|
4992 # as a filter in such a situation. |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4993 self.assertEqual(1, CountDicomResults('PatientSex')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4994 self.assertEqual(1, CountDicomResults('PatientSex=')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4995 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
|
4996 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4997 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4998 def test_rest_modalities_in_study(self): |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4999 # 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
|
5000 # 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
|
5001 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5002 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5003 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5004 'Query' : { 'ModalitiesInStudy' : 'US' }}) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5005 self.assertEqual(0, len(a)) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5006 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5007 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5008 'Query' : { 'ModalitiesInStudy' : 'US\\CT' }}) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5009 self.assertEqual(1, len(a)) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5010 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5011 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5012 'Query' : { 'ModalitiesInStudy' : 'CT' }}) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5013 self.assertEqual(1, len(a)) |
| 211 | 5014 |
| 5015 | |
| 5016 def test_series_status(self): | |
| 5017 def HasCompletedInChanges(): | |
| 5018 for c in DoGet(_REMOTE, '/changes?limit=1000&since=0')['Changes']: | |
| 5019 if c['ChangeType'] == 'CompletedSeries': | |
| 5020 return True; | |
| 5021 | |
| 5022 return False | |
| 5023 | |
| 5024 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm') | |
| 5025 series = '8ea120d7-5057d919-837dfbcc-ccd04e0f-7f3a94aa' | |
| 5026 self.assertEqual('Unknown', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 5027 self.assertFalse(HasCompletedInChanges()) | |
| 5028 | |
| 5029 series = 'ce25ecb6-ed79d004-5ae43ca7-3fc89bc5-67511614' | |
| 5030 | |
| 5031 for i in range(3): | |
| 5032 UploadInstance(_REMOTE, 'Series/Lena-%d.dcm' % (i + 1)) | |
| 5033 self.assertEqual('Missing', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 5034 self.assertFalse(HasCompletedInChanges()) | |
| 5035 | |
| 5036 UploadInstance(_REMOTE, 'Series/Lena-4.dcm') | |
| 5037 self.assertEqual('Complete', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 5038 self.assertTrue(HasCompletedInChanges()) | |
| 5039 | |
| 5040 DoDelete(_REMOTE, '/changes') | |
| 5041 self.assertFalse(HasCompletedInChanges()) | |
| 5042 | |
| 5043 UploadInstance(_REMOTE, 'Series/Lena-5.dcm') | |
| 5044 self.assertEqual('Inconsistent', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 5045 self.assertFalse(HasCompletedInChanges()) | |
| 5046 | |
| 215 | 5047 |
| 5048 def test_dicomweb(self): | |
| 5049 def Compare(dicom, reference): | |
| 5050 a = UploadInstance(_REMOTE, dicom) ['ID'] | |
| 5051 b = DoGet(_REMOTE, '/instances/%s/file' % a, | |
| 5052 headers = { 'Accept' : 'application/dicom+json' }) | |
| 5053 with open(GetDatabasePath(reference), 'rb') as c: | |
| 5054 d = json.load(c) | |
| 220 | 5055 AssertAlmostEqualRecursive(self, d, b) |
| 215 | 5056 |
| 5057 Compare('DummyCT.dcm', 'DummyCT.json') | |
| 5058 Compare('MarekLatin2.dcm', 'MarekLatin2.json') | |
| 5059 Compare('HierarchicalAnonymization/StructuredReports/IM0', | |
| 5060 'HierarchicalAnonymization/StructuredReports/IM0.json') | |
| 217 | 5061 |
| 5062 | |
| 5063 def test_issue_95_encodings(self): | |
| 319 | 5064 # https://bugs.orthanc-server.com/show_bug.cgi?id=95 |
| 217 | 5065 # Check out image: "../Database/Encodings/DavidClunie/charsettests.screenshot.png" |
| 5066 | |
| 5067 # Very useful tool: "file2" from package "file-kanji" | |
| 5068 | |
| 5069 def GetPatientName(dicom): | |
| 5070 i = UploadInstance(_REMOTE, dicom) ['ID'] | |
| 5071 j = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) | |
| 5072 return j['PatientName'] | |
| 5073 | |
| 5074 def ComparePatientName(name, dicom): | |
| 5075 self.assertEqual(name, GetPatientName(dicom)) | |
| 5076 | |
| 5077 # gdcmraw -t 10,10 -i SCSFREN -o /tmp/tag && uconv -f ISO-IR-100 -t UTF-8 /tmp/tag && echo | |
| 5078 ComparePatientName(u'Buc^Jérôme', 'Encodings/DavidClunie/SCSFREN') | |
| 5079 | |
| 5080 # gdcmraw -t 10,10 -i SCSI2 -o /tmp/tag && uconv -f KOREAN -t UTF-8 /tmp/tag && echo | |
| 5081 ComparePatientName(u'Hong^Gildong=洪^吉洞=홍^길동', 'Encodings/DavidClunie/SCSI2') # Since Orthanc 1.5.5 | |
| 5082 | |
| 5083 # gdcmraw -t 10,10 -i SCSX2 -o /tmp/tag && uconv -f GB18030 -t UTF-8 /tmp/tag && echo | |
| 5084 ComparePatientName(u'Wang^XiaoDong=王^小东=', 'Encodings/DavidClunie/SCSX2') | |
| 5085 | |
| 5086 # gdcmraw -t 10,10 -i SCSX1 -o /tmp/tag && cat /tmp/tag && echo | |
| 5087 ComparePatientName(u'Wang^XiaoDong=王^小東=', 'Encodings/DavidClunie/SCSX1') | |
| 5088 | |
| 5089 # gdcmraw -t 10,10 -i SCSH31 -o /tmp/tag && uconv -f JIS -t UTF-8 /tmp/tag && echo | |
| 5090 ComparePatientName(u'Yamada^Tarou=山田^太郎=やまだ^たろう', 'Encodings/DavidClunie/SCSH31') | |
| 5091 | |
| 5092 # gdcmraw -t 10,10 -i SCSGERM -o /tmp/tag && uconv -f ISO-IR-100 -t UTF-8 /tmp/tag && echo | |
| 5093 ComparePatientName(u'Äneas^Rüdiger', 'Encodings/DavidClunie/SCSGERM') | |
| 5094 | |
| 5095 # gdcmraw -t 10,10 -i SCSGREEK -o /tmp/tag && uconv -f ISO-IR-126 -t UTF-8 /tmp/tag && echo | |
| 5096 ComparePatientName(u'Διονυσιος', 'Encodings/DavidClunie/SCSGREEK') | |
| 5097 | |
| 5098 # gdcmraw -t 10,10 -i SCSRUSS -o /tmp/tag && uconv -f ISO-IR-144 -t UTF-8 /tmp/tag && echo | |
| 5099 ComparePatientName(u'Люкceмбypг', 'Encodings/DavidClunie/SCSRUSS') | |
| 5100 | |
| 5101 # gdcmraw -t 10,10 -i SCSHBRW -o /tmp/tag && uconv -f ISO-IR-138 -t UTF-8 /tmp/tag && echo | |
| 5102 # NB: Hebrew is a right-to-left encoding, copying/pasting from | |
| 5103 # Linux console into Emacs automatically reverse the string | |
| 5104 ComparePatientName(u'שרון^דבורה', 'Encodings/DavidClunie/SCSHBRW') | |
| 5105 | |
| 5106 # gdcmraw -t 10,10 -i SCSARAB -o /tmp/tag && uconv -f ISO-IR-127 -t UTF-8 /tmp/tag && echo | |
| 5107 # NB: Right-to-left as for Hebrew (SCSHBRW), and the Ubuntu console can't display such | |
| 5108 # characters by default, but copy/paste works with Emacs | |
| 5109 ComparePatientName(u'قباني^لنزار', 'Encodings/DavidClunie/SCSARAB') | |
| 5110 | |
| 5111 # SCSH32: This SpecificCharacterSet is composed of 2 | |
| 5112 # codepages: "ISO 2022 IR 13" (i.e. "SHIFT_JIS") until the | |
| 5113 # first equal, then "ISO 2022 IR 87" (i.e. "JIS") for the | |
| 5114 # remainer. Orthanc only takes into consideration the first | |
| 5115 # codepage: This is a limitation. | |
| 5116 # gdcmraw -t 10,10 -i SCSH32 -o /tmp/tag && cut -d '=' -f 1 /tmp/tag | uconv -f SHIFT_JIS -t UTF-8 | |
| 5117 self.assertTrue(GetPatientName('Encodings/DavidClunie/SCSH32').startswith(u'ﾔﾏﾀﾞ^ﾀﾛｳ=')) | |
|
218
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5118 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5119 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5120 def test_findscu_missing_tags(self): |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5121 # dcmodify -e Rows DummyCTInvalidRows.dcm -gst -gse -gin |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5122 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5123 UploadInstance(_REMOTE, 'DummyCTInvalidRows.dcm') |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5124 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5125 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
|
5126 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5127 # We have 2 instances... |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5128 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5129 self.assertEqual(2, len(patientNames)) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5130 self.assertEqual('KNIX', patientNames[0]) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5131 self.assertEqual('KNIX', patientNames[1]) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5132 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5133 # ...but only 1 value for the "Rows" tag |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5134 rows = re.findall('\(0028,0010\) US ([0-9]+)', i) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5135 self.assertEqual(1, len(rows)) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5136 self.assertEqual('512', rows[0]) |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5137 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5138 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5139 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5140 def test_bitbucket_issue_131(self): |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5141 # "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
|
5142 # StudyInstanceUID in it's database." |
| 319 | 5143 # 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
|
5144 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5145 # Insert 2 instances, with the same StudyInstanceUID, but with |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5146 # different patient IDs. Orthanc will create 2 distincts |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5147 # patients, and the hierarchy of resources above the two |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5148 # instances will be fully disjoint. |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5149 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-a.dcm') |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5150 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-b.dcm') |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5151 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5152 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5153 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5154 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5155 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5156 'Level' : 'Study', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5157 'Query' : {"PatientID": "A" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5158 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5159 # 1 study is matched |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5160 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
|
5161 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5162 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 5163 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 5164 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 5165 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5166 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5167 # 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
|
5168 # 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
|
5169 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5170 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5171 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5172 # Match the 2 studies |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5173 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5174 'Level' : 'Study', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5175 'Query' : {"StudyInstanceUID": "2.25.123" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5176 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
|
5177 DropOrthanc(_LOCAL) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5178 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 5179 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 5180 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 5181 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5182 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5183 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5184 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5185 # 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
|
5186 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5187 'Level' : 'Patient', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5188 'Query' : {"PatientID": "A" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5189 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
|
5190 DropOrthanc(_LOCAL) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5191 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 5192 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 5193 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 5194 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5195 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5196 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5197 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5198 # 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
|
5199 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5200 'Level' : 'Series', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5201 'Query' : {"PatientID": "A" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5202 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
|
5203 DropOrthanc(_LOCAL) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5204 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 5205 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 5206 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 5207 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5208 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5209 |
|
233
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5210 |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5211 def test_bitbucket_issue_136(self): |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5212 UploadInstance(_REMOTE, 'Issue137.dcm') |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5213 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
|
5214 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5215 self.assertEqual(1, len(patientNames)) |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5216 self.assertEqual('John Doe', patientNames[0]) |
|
234
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5217 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5218 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5219 def test_anonymize_relationships_4(self): |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5220 # 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
|
5221 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
|
5222 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
|
5223 study = '0c923249-d52121a9-2b7167f7-6b85534f-0943697e' |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5224 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5225 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, '{}', |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5226 'application/json')['ID'] |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5227 series = DoGet(_REMOTE, '/studies/%s/series' % anonymized) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5228 self.assertEqual(2, len(series)) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5229 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5230 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
|
5231 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
|
5232 self.assertEqual(1, len(cr)) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5233 self.assertEqual(1, len(pr)) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5234 self.assertEqual(1, len(cr[0]['Instances'])) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5235 self.assertEqual(1, len(pr[0]['Instances'])) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5236 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5237 crinstance = DoGet(_REMOTE, '/instances/%s' % cr[0]['Instances'][0]) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5238 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
|
5239 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5240 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
|
5241 crinstance['MainDicomTags']['SOPInstanceUID']) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5242 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
|
5243 '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
|
5244 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5245 # This fails on Orthanc <= 1.5.6 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5246 self.assertEqual(tags['0008,1115'][0]['0020,000e'], |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5247 cr[0]['MainDicomTags']['SeriesInstanceUID']) |
|
235
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5248 |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5249 |
|
255
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5250 def test_anonymize_relationships_5(self): |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5251 ct1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/CT01.dcm') |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5252 rt1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/RT.dcm') |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5253 oStudyId = ct1['ParentStudy'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5254 oCtInstanceId = ct1['ID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5255 oRtInstanceId = rt1['ID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5256 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5257 oCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oCtInstanceId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5258 oRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oRtInstanceId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5259 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5260 # first validate the relationships in the source data |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5261 oStudyUID = oCtTags['StudyInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5262 oRtSeriesUID = oRtTags['SeriesInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5263 oRtInstanceUID = oRtTags['SOPInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5264 oRtFrameOfReferenceUID = oRtTags['ReferencedFrameOfReferenceSequence'][0]['FrameOfReferenceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5265 oCtSeriesUID = oCtTags['SeriesInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5266 oCtInstanceUID = oCtTags['SOPInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5267 oCtFrameOfReferenceUID = oCtTags['FrameOfReferenceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5268 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5269 oContourSequenceCount = len(oRtTags['ROIContourSequence'][0]['ContourSequence']) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5270 self.assertEqual(oCtFrameOfReferenceUID, oRtFrameOfReferenceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5271 self.assertEqual(oStudyUID, oRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID']) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5272 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
|
5273 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
|
5274 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
|
5275 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5276 ### anonymize |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5277 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5278 aStudyId = DoPost(_REMOTE, '/studies/%s/anonymize' % oStudyId, '{}', |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5279 'application/json')['ID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5280 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5281 ### validate |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5282 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5283 aSeries = DoGet(_REMOTE, '/studies/%s/series' % aStudyId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5284 self.assertEqual(2, len(aSeries)) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5285 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5286 aCt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CT', aSeries)) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5287 aRt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'RTSTRUCT', aSeries)) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5288 aCtInstanceId = aCt[0]['Instances'][0] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5289 aRtInstanceId = aRt[0]['Instances'][0] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5290 aCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aCtInstanceId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5291 aRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aRtInstanceId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5292 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5293 # now validate the relationships in the anonymized data |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5294 aStudyUID = aCtTags['StudyInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5295 aRtSeriesUID = aRtTags['SeriesInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5296 aRtInstanceUID = aRtTags['SOPInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5297 aRtFrameOfReferenceUID = aRtTags['ReferencedFrameOfReferenceSequence'][0]['FrameOfReferenceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5298 aCtSeriesUID = aCtTags['SeriesInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5299 aCtInstanceUID = aCtTags['SOPInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5300 aCtFrameOfReferenceUID = aCtTags['FrameOfReferenceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5301 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5302 aContourSequenceCount = len(aRtTags['ROIContourSequence'][0]['ContourSequence']) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5303 # make sure all UIDs have been updated |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5304 self.assertNotEqual(oStudyUID, aStudyUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5305 self.assertNotEqual(oRtSeriesUID, aRtSeriesUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5306 self.assertNotEqual(oRtInstanceUID, aRtInstanceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5307 self.assertNotEqual(oRtFrameOfReferenceUID, aRtFrameOfReferenceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5308 self.assertNotEqual(oCtSeriesUID, aCtSeriesUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5309 self.assertNotEqual(oCtInstanceUID, aCtInstanceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5310 self.assertNotEqual(oCtFrameOfReferenceUID, aCtFrameOfReferenceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5311 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5312 # validate the relationships |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5313 self.assertEqual(oContourSequenceCount, aContourSequenceCount) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5314 self.assertEqual(aCtFrameOfReferenceUID, aRtFrameOfReferenceUID) |
| 256 | 5315 self.assertEqual(aStudyUID, aRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID']) |
| 5316 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
|
5317 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
|
5318 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
|
5319 |
| 256 | 5320 def test_anonymize_relationships_5b(self): |
| 5321 # same test as previous one but, this time, we force the StudyInstanceUID | |
| 5322 ct1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/CT01.dcm') | |
| 5323 rt1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/RT.dcm') | |
| 5324 oStudyId = ct1['ParentStudy'] | |
| 5325 oCtInstanceId = ct1['ID'] | |
| 5326 oRtInstanceId = rt1['ID'] | |
| 5327 | |
| 5328 oCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oCtInstanceId) | |
| 5329 oRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oRtInstanceId) | |
| 5330 | |
| 5331 ### anonymize while forcing the StudyInstanceUID | |
| 5332 | |
| 5333 aStudyId = DoPost(_REMOTE, '/studies/%s/anonymize' % oStudyId, '{ "Replace" : { "StudyInstanceUID" : "1.2.3.4"}, "Force": true}', | |
| 5334 'application/json')['ID'] | |
| 5335 | |
| 5336 ### validate | |
| 5337 | |
| 5338 aSeries = DoGet(_REMOTE, '/studies/%s/series' % aStudyId) | |
| 5339 self.assertEqual(2, len(aSeries)) | |
| 5340 | |
| 5341 aCt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CT', aSeries)) | |
| 5342 aRt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'RTSTRUCT', aSeries)) | |
| 5343 aCtInstanceId = aCt[0]['Instances'][0] | |
| 5344 aRtInstanceId = aRt[0]['Instances'][0] | |
| 5345 aCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aCtInstanceId) | |
| 5346 aRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aRtInstanceId) | |
| 5347 | |
| 5348 self.assertEqual("1.2.3.4", aCtTags['StudyInstanceUID']) | |
| 5349 self.assertEqual("1.2.3.4", aRtTags['StudyInstanceUID']) | |
| 5350 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
|
5351 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5352 |
|
235
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5353 def test_bitbucket_issue_140(self): |
| 266 | 5354 # "Modifying private tags with REST API changes VR from LO to |
| 267 | 5355 # UN." This test fails if DCMTK <= 3.6.1 (e.g. fails on Ubuntu 16.04). |
| 319 | 5356 # 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
|
5357 source = UploadInstance(_REMOTE, 'Issue140.dcm') ['ID'] |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5358 series = DoGet(_REMOTE, '/instances/%s' % source) ['ParentSeries'] |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5359 |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5360 target = DoPost(_REMOTE, '/series/%s/modify' % series, { |
| 266 | 5361 'Replace' : { 'RadioButton3' : 'aaabbbccc' }, |
| 5362 'PrivateCreator' : 'RadioLogic', # <= the trick is here | |
|
235
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5363 }, 'application/json') ['ID'] |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5364 |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5365 instances = DoGet(_REMOTE, '/series/%s/instances' % target) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5366 self.assertEqual(1, len(instances)) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5367 |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5368 tags = DoGet(_REMOTE, '/instances/%s/tags' % source) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5369 t = tags['4321,1012'] |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5370 self.assertEqual('String', t['Type']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5371 self.assertEqual('RadioButton3', t['Name']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5372 self.assertEqual('RadioLogic', t['PrivateCreator']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5373 self.assertEqual('jklmopq', t['Value']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5374 |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5375 tags = DoGet(_REMOTE, '/instances/%s/tags' % instances[0]['ID']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5376 t = tags['4321,1012'] |
| 327 | 5377 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
|
5378 self.assertEqual('RadioButton3', t['Name']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5379 self.assertEqual('RadioLogic', t['PrivateCreator']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5380 self.assertEqual('aaabbbccc', t['Value']) |
|
236
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5381 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5382 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5383 def test_find_normalize(self): |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5384 # https://groups.google.com/d/msg/orthanc-users/AIwooGjsh94/YL28MNY4AgAJ |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5385 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5386 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5387 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5388 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5389 'Level' : 'Instance', |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5390 'Query' : { 'Rows' : '42' } |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5391 }) ['ID'] |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5392 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5393 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5394 self.assertEqual(1, len(b)) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5395 self.assertFalse('Rows' in b[0]) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5396 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5397 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5398 'Level' : 'Instance', |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5399 'Query' : { 'Rows' : '42' }, |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5400 'Normalize' : False |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5401 }) ['ID'] |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5402 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5403 b = DoGet(_REMOTE, '/queries/%s/answers' % a) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5404 self.assertEqual(0, len(b)) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5405 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5406 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5407 'Level' : 'Instance', |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5408 'Query' : { 'Rows' : '512' }, |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5409 'Normalize' : False |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5410 }) ['ID'] |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5411 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5412 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5413 self.assertEqual(1, len(b)) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5414 self.assertTrue('Rows' in b[0]) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5415 self.assertEqual('512', b[0]['Rows']) |
| 237 | 5416 |
| 5417 a = DoPost(_REMOTE, '/modalities/self/query', { | |
| 5418 'Level' : 'Instance', | |
| 5419 'Query' : { 'Rows' : '' }, | |
| 5420 'Normalize' : False | |
| 5421 }) ['ID'] | |
| 5422 | |
| 5423 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) | |
| 5424 self.assertEqual(1, len(b)) | |
| 5425 self.assertTrue('Rows' in b[0]) | |
| 5426 self.assertEqual('512', b[0]['Rows']) | |
| 5427 | |
| 5428 self.assertRaises(Exception, lambda: DoPost( | |
| 5429 _REMOTE, '/modalities/self/query', { | |
| 5430 'Level' : 'Instance', | |
| 5431 'Query' : { 'Rows' : '*' }, # Out-of-range value | |
| 5432 'Normalize' : False | |
| 5433 })) | |
|
243
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5434 |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5435 |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5436 def test_bitbucket_issue_141(self): |
| 319 | 5437 # 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
|
5438 a = UploadInstance(_REMOTE, 'Issue141.dcm') ['ID'] |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5439 study = '494c8037-b237f263-d8f15075-c8cb2280-daf39bd1' |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5440 |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5441 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f: |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5442 pdf = f.read() |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5443 |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5444 b = DoPost(_REMOTE, '/tools/create-dicom', { |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5445 'Parent' : study, |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5446 'Tags' : {}, |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5447 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5448 }) ['ID'] |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5449 |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5450 tagsA = DoGet(_REMOTE, '/instances/%s/tags?short' % a) |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5451 tagsB = DoGet(_REMOTE, '/instances/%s/tags?short' % b) |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5452 self.assertEqual(tagsA['0008,0005'], tagsB['0008,0005']) |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5453 self.assertEqual(tagsA['0008,1030'], tagsB['0008,1030']) |
|
247
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5454 |
|
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5455 |
|
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5456 def test_modifying_missing_patientid(self): |
|
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5457 # 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
|
5458 UploadInstance(_REMOTE, '2019-06-17-VedranZdesic.dcm') |
|
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5459 DoPost(_REMOTE, '/studies/0c4aca1d-c107a241-6659d6aa-594c674a-a468b94a/modify', {}) |
| 262 | 5460 |
| 5461 | |
| 5462 def test_log_level(self): | |
| 319 | 5463 # https://bugs.orthanc-server.com/show_bug.cgi?id=65 |
| 262 | 5464 original = DoGet(_REMOTE, '/tools/log-level') |
| 5465 | |
| 5466 DoPut(_REMOTE, '/tools/log-level', 'default') | |
| 5467 self.assertEqual('default', DoGet(_REMOTE, '/tools/log-level')) | |
| 5468 DoGet(_REMOTE, '/system') | |
| 5469 | |
| 5470 DoPut(_REMOTE, '/tools/log-level', 'verbose') | |
| 5471 self.assertEqual('verbose', DoGet(_REMOTE, '/tools/log-level')) | |
| 5472 DoGet(_REMOTE, '/system') | |
| 5473 | |
| 5474 DoPut(_REMOTE, '/tools/log-level', 'trace') | |
| 5475 self.assertEqual('trace', DoGet(_REMOTE, '/tools/log-level')) | |
| 5476 DoGet(_REMOTE, '/system') | |
| 5477 | |
| 5478 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/log-level', 'nope')) | |
| 5479 | |
| 5480 # Switch back to the original log level | |
| 5481 DoPut(_REMOTE, '/tools/log-level', original) | |
|
264
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5482 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5483 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5484 def test_upload_compressed(self): |
| 265 | 5485 # New in Orthanc 1.6.0 |
|
264
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5486 with open(GetDatabasePath('DummyCT.dcm.gz'), 'rb') as f: |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5487 d = f.read() |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5488 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5489 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances', d, 'application/dicom')) |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5490 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5491 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances', d, 'application/dicom', |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5492 headers = { 'Content-Encoding' : 'nope' })) |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5493 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5494 a = DoPost(_REMOTE, '/instances', d, 'application/dicom', |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5495 headers = { 'Content-Encoding' : 'gzip' }) |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5496 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a['ID']) |
| 262 | 5497 |
| 5498 | |
|
263
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5499 def test_study_series_find_inconsistency(self): |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5500 # 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
|
5501 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5502 def CountAnswers(query): |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5503 a = DoPost(_REMOTE, 'modalities/self/query', query) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5504 return len(DoGet(_REMOTE, '%s/answers' % a['Path'])) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5505 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5506 # 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
|
5507 # "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
|
5508 # the "main DICOM tags" of Orthanc. |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5509 UploadInstance(_REMOTE, 'Issue137.dcm') |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5510 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5511 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5512 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5513 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5514 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5515 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5516 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5517 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5518 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5519 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5520 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5521 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5522 ## "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
|
5523 ## 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
|
5524 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5525 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5526 # 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
|
5527 # is wiped out by the normalization |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5528 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5529 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5530 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5531 'SeriesDescription' : 'NOPE' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5532 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5533 'Normalize' : False |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5534 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5535 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5536 # This test fails on Orthanc <= 1.5.8 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5537 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5538 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5539 '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
|
5540 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5541 'Normalize' : False |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5542 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5543 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5544 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5545 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5546 'SeriesDescription' : 'THIS^VALUE^IS^WIPED^OUT' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5547 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5548 'Normalize' : True |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5549 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5550 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5551 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5552 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5553 'SeriesDescription' : '*' # Matches, as wiped out by the normalization |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5554 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5555 'Normalize' : True |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5556 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5557 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5558 for normalize in [ True, False ]: |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5559 # 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
|
5560 # normalization has no effect |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5561 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5562 # "Universal matching" will match all entities, including |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5563 # those with the missing tag |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5564 # 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
|
5565 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5566 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5567 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5568 'SeriesDescription' : '' # Universal matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5569 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5570 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5571 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5572 # "Universal matching" will match all entities, including |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5573 # those with the missing tag |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5574 # 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
|
5575 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5576 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5577 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5578 'SeriesDescription' : '*' # Wildcard matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5579 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5580 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5581 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5582 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5583 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5584 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5585 '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
|
5586 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5587 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5588 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5589 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5590 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5591 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5592 'SeriesDescription' : '*MISMATCHED^VALUE*' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5593 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5594 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5595 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5596 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5597 # Universal matching matches any instance, even if the |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5598 # 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
|
5599 # makes no sense |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5600 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5601 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5602 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5603 'SeriesDescription' : '' # Universal matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5604 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5605 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5606 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5607 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5608 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5609 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5610 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5611 ## "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
|
5612 ## |
|
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 # 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
|
5615 # is wiped out by the normalization |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5616 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5617 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5618 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5619 'ProtocolName' : 'NOPE' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5620 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5621 'Normalize' : False |
|
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 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5624 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5625 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5626 '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
|
5627 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5628 'Normalize' : False |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5629 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5630 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5631 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5632 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5633 'ProtocolName' : 'THIS^VALUE^IS^WIPED^OUT' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5634 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5635 'Normalize' : True |
|
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 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5638 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5639 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5640 'ProtocolName' : '*' # Matches, as wiped out by the normalization |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5641 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5642 'Normalize' : True |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5643 })) |
|
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 for normalize in [ True, False ]: |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5646 # 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
|
5647 # normalization has no effect |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5648 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5649 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5650 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5651 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5652 'ProtocolName' : '' # Universal matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5653 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5654 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5655 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5656 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5657 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5658 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5659 '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
|
5660 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5661 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5662 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5663 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5664 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5665 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5666 'ProtocolName' : '*MISMATCHED^VALUE*' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5667 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5668 'Normalize' : normalize, |
|
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 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5671 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5672 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5673 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5674 'ProtocolName' : '' # Universal matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5675 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5676 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5677 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5678 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5679 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5680 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5681 ## "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
|
5682 ## |
|
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 for level in [ 'Study', 'Series' ] : |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5685 for normalize in [ True, False ]: |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5686 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5687 'Level' : level, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5688 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5689 'StudyInstanceUID' : '' # Universal matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5690 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5691 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5692 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5693 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5694 'Level' : level, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5695 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5696 'StudyInstanceUID' : 'MISMATCHED^VALUE' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5697 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5698 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5699 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5700 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5701 'Level' : level, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5702 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5703 '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
|
5704 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5705 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5706 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5707 |
| 269 | 5708 # 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
|
5709 # This test fails on Orthanc <= 1.5.8 |
| 269 | 5710 self.assertRaises(Exception, lambda: CountAnswers({ |
|
263
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5711 'Level' : level, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5712 'Query' : { |
| 269 | 5713 'StudyInstanceUID' : '*' |
|
263
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5714 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5715 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5716 })) |
| 265 | 5717 |
| 5718 | |
| 5719 def test_rendered(self): | |
| 5720 # New in Orthanc 1.6.0 | |
| 5721 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID'] | |
| 5722 im = GetImage(_REMOTE, '/instances/%s/rendered' % i) | |
| 5723 self.assertEqual("RGB", im.mode) | |
| 5724 self.assertEqual(41, im.size[0]) | |
| 5725 self.assertEqual(41, im.size[1]) | |
| 5726 | |
| 5727 # http://effbot.org/zone/pil-comparing-images.htm | |
| 5728 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png')) | |
| 5729 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None) | |
| 5730 | |
| 5731 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10' % i) | |
| 5732 self.assertEqual("RGB", im.mode) | |
| 5733 self.assertEqual(10, im.size[0]) | |
| 5734 self.assertEqual(10, im.size[1]) | |
| 5735 | |
| 5736 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10' % i) | |
| 5737 self.assertEqual("RGB", im.mode) | |
| 5738 self.assertEqual(10, im.size[0]) | |
| 5739 self.assertEqual(10, im.size[1]) | |
| 5740 | |
| 5741 im = GetImage(_REMOTE, '/instances/%s/rendered?height=128' % i) | |
| 5742 self.assertEqual("RGB", im.mode) | |
| 5743 self.assertEqual(128, im.size[0]) | |
| 5744 self.assertEqual(128, im.size[1]) | |
| 5745 | |
| 5746 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10&smooth=0' % i) | |
| 5747 self.assertEqual("RGB", im.mode) | |
| 5748 self.assertEqual(10, im.size[0]) | |
| 5749 self.assertEqual(10, im.size[1]) | |
| 5750 | |
| 5751 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10&smooth=1' % i) | |
| 5752 self.assertEqual("RGB", im.mode) | |
| 5753 self.assertEqual(10, im.size[0]) | |
| 5754 self.assertEqual(10, im.size[1]) | |
| 5755 | |
| 5756 im = GetImage(_REMOTE, '/instances/%s/rendered?height=5&width=10' % i) | |
| 5757 self.assertEqual("RGB", im.mode) | |
| 5758 self.assertEqual(5, im.size[0]) | |
| 5759 self.assertEqual(5, im.size[1]) | |
| 5760 | |
| 5761 | |
| 5762 # Grayscale image | |
| 5763 i = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] | |
| 5764 im = GetImage(_REMOTE, '/instances/%s/rendered' % i) | |
| 5765 self.assertEqual("L", im.mode) | |
| 5766 self.assertEqual(288, im.size[0]) | |
| 5767 self.assertEqual(288, im.size[1]) | |
| 5768 self.assertEqual(0, im.getpixel((0, 0))) | |
| 5769 | |
| 5770 # Those are the original windowing parameters that are written | |
| 5771 # inside the DICOM file | |
| 5772 im2 = GetImage(_REMOTE, '/instances/%s/rendered?window-center=248.009544468547&window-width=431.351843817788' % i) | |
| 5773 self.assertEqual("L", im2.mode) | |
| 5774 self.assertEqual(288, im2.size[0]) | |
| 5775 self.assertEqual(288, im2.size[1]) | |
| 5776 self.assertTrue(ImageChops.difference(im, im2).getbbox() is None) | |
| 5777 | |
| 5778 im = GetImage(_REMOTE, '/instances/%s/rendered?width=512&smooth=0' % i) | |
| 5779 self.assertEqual("L", im.mode) | |
| 5780 self.assertEqual(512, im.size[0]) | |
| 5781 self.assertEqual(512, im.size[1]) | |
| 5782 | |
| 5783 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&smooth=0' % i) | |
| 5784 self.assertEqual("L", im.mode) | |
| 5785 self.assertEqual(10, im.size[0]) | |
| 5786 self.assertEqual(10, im.size[1]) | |
| 5787 | |
| 5788 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&smooth=1' % i) | |
| 5789 self.assertEqual("L", im.mode) | |
| 5790 self.assertEqual(10, im.size[0]) | |
| 5791 self.assertEqual(10, im.size[1]) | |
| 5792 | |
| 5793 im = GetImage(_REMOTE, '/instances/%s/rendered?width=1&window-center=-1000' % i) | |
| 5794 self.assertEqual("L", im.mode) | |
| 5795 self.assertEqual(1, im.size[0]) | |
| 5796 self.assertEqual(1, im.size[1]) | |
| 5797 self.assertEqual(255, im.getpixel((0, 0))) | |
| 5798 | |
| 5799 im = GetImage(_REMOTE, '/instances/%s/rendered?width=1&window-center=1000' % i) | |
| 5800 self.assertEqual("L", im.mode) | |
| 5801 self.assertEqual(1, im.size[0]) | |
| 5802 self.assertEqual(1, im.size[1]) | |
| 5803 self.assertEqual(0, im.getpixel((0, 0))) | |
| 5804 | |
| 5805 | |
| 5806 # Test monochrome 1 | |
| 5807 i = UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')['ID'] | |
| 5808 im = GetImage(_REMOTE, '/instances/%s/rendered' % i) | |
| 5809 self.assertEqual("L", im.mode) | |
| 5810 self.assertEqual(2010, im.size[0]) | |
| 5811 self.assertEqual(2446, im.size[1]) | |
| 5812 self.assertEqual(0, im.getpixel((0, 0))) | |
| 5813 im = GetImage(_REMOTE, '/instances/%s/rendered?width=20' % i) | |
| 5814 self.assertEqual("L", im.mode) | |
| 5815 self.assertEqual(20, im.size[0]) | |
| 5816 self.assertEqual(24, im.size[1]) | |
| 5817 im = GetImage(_REMOTE, '/instances/%s/rendered?height=24' % i) | |
| 5818 self.assertEqual("L", im.mode) | |
| 5819 self.assertEqual(20, im.size[0]) | |
| 5820 self.assertEqual(24, im.size[1]) | |
| 5821 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&height=24' % i) | |
| 5822 self.assertEqual("L", im.mode) | |
| 5823 self.assertEqual(10, im.size[0]) | |
| 5824 self.assertEqual(12, im.size[1]) | |
| 5825 im = GetImage(_REMOTE, '/instances/%s/rendered?width=40&height=24' % i) | |
| 5826 self.assertEqual("L", im.mode) | |
| 5827 self.assertEqual(20, im.size[0]) | |
| 5828 self.assertEqual(24, im.size[1]) | |
|
268
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5829 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5830 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5831 def test_bitbucket_issue_154(self): |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5832 # "Matching against list of UID-s by C-MOVE" |
| 319 | 5833 # 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
|
5834 a = UploadInstance(_REMOTE, 'Issue154-d1.dcm') ['ID'] |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5835 b = UploadInstance(_REMOTE, 'Issue154-d2.dcm') ['ID'] |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5836 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5837 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
|
5838 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
|
5839 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
|
5840 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5841 # C-FIND is working on list of UIDs |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5842 i = CallFindScu([ '-k', 'QueryRetrieveLevel=SERIES', |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5843 '-k', 'StudyInstanceUID=%s' % study, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5844 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2) ]) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5845 series = re.findall('\(0020,000e\).*?\[(.*?)\]', i) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5846 self.assertEqual(2, len(series)) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5847 self.assertTrue(series1 in series) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5848 self.assertTrue(series2 in series) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5849 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5850 # Individual retrieval is working in Orthanc < 1.6.0 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5851 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5852 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5853 '--study', '-k', 'QueryRetrieveLevel=SERIES', |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5854 '-k', 'StudyInstanceUID=%s' % study, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5855 '-k', 'SeriesInstanceUID=%s' % series1, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5856 ]))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5857 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5858 '--study', '-k', 'QueryRetrieveLevel=SERIES', |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5859 '-k', 'StudyInstanceUID=%s' % study, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5860 '-k', 'SeriesInstanceUID=%s' % series2, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5861 ]))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5862 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5863 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5864 DropOrthanc(_LOCAL) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5865 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5866 # 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
|
5867 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5868 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5869 '--study', '-k', 'QueryRetrieveLevel=SERIES', |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5870 '-k', 'StudyInstanceUID=%s' % study, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5871 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2), |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5872 ]))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5873 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5874 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5875 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5876 def test_storage_commitment_api(self): |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5877 # 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
|
5878 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5879 def WaitTransaction(uid): |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5880 while True: |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5881 s = DoGet(_REMOTE, '/storage-commitment/%s' % uid) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5882 if s['Status'] != 'Pending': |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5883 return s |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5884 else: |
|
342
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
5885 time.sleep(0.01) |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5886 |
| 281 | 5887 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5888 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
|
5889 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
|
5890 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5891 # Against self |
| 281 | 5892 transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', { |
| 5893 "DicomInstances" : [ [ sopClassUid, sopInstanceUid ] ], | |
| 5894 }) ['ID'] | |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5895 self.assertTrue(transaction.startswith('2.25.')) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5896 |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5897 result = WaitTransaction(transaction) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5898 self.assertEqual('ORTHANC', result['RemoteAET']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5899 self.assertEqual('Success', result['Status']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5900 self.assertEqual(1, len(result['Success'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5901 self.assertEqual(0, len(result['Failures'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5902 self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5903 self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5904 |
| 281 | 5905 tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', { |
| 5906 "DicomInstances" : [ | |
| 5907 { 'SOPClassUID' : sopClassUid, | |
| 5908 'SOPInstanceUID' : sopInstanceUid }, | |
| 5909 ], | |
| 5910 }) | |
| 5911 self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID']) | |
| 5912 self.assertEqual(result, WaitTransaction(transaction)) | |
| 5913 | |
| 5914 tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', { | |
| 5915 "Resources" : [ | |
| 5916 instance['ID'], | |
| 5917 instance['ParentSeries'], | |
| 5918 instance['ParentStudy'], | |
| 5919 instance['ParentPatient'], | |
| 5920 ] | |
| 5921 }) | |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5922 self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5923 self.assertEqual(result, WaitTransaction(transaction)) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5924 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5925 |
| 281 | 5926 transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', { |
| 5927 "DicomInstances" : [ | |
| 5928 [ 'nope', 'nope2' ], | |
| 5929 [ sopClassUid, sopInstanceUid ], | |
| 5930 ], | |
| 5931 }) ['ID'] | |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5932 self.assertTrue(transaction.startswith('2.25.')) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5933 |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5934 result = WaitTransaction(transaction) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5935 self.assertEqual('ORTHANC', result['RemoteAET']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5936 self.assertEqual('Failure', result['Status']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5937 self.assertEqual(1, len(result['Success'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5938 self.assertEqual(1, len(result['Failures'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5939 self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5940 self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5941 self.assertEqual('nope', result['Failures'][0]['SOPClassUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5942 self.assertEqual('nope2', result['Failures'][0]['SOPInstanceUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5943 self.assertEqual(274, result['Failures'][0]['FailureReason']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5944 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5945 # Cannot remove items from a failed storage commitment transaction |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5946 self.assertRaises(Exception, lambda: |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5947 DoPost(_REMOTE, '/storage-commitment/%s/remove' % transaction)) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5948 |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5949 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5950 # Against Orthanc 0.8.6, that does not support storage commitment |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5951 self.assertRaises(Exception, lambda: |
| 281 | 5952 DoPost(_REMOTE, '/modalities/orthanctest/storage-commitment', { |
| 5953 "DicomInstances" : [ | |
| 5954 [ sopClassUid, sopInstanceUid ], | |
| 5955 ] | |
| 5956 })) | |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5957 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5958 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5959 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5960 def test_storage_commitment_store(self): |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5961 # 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
|
5962 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5963 def WaitTransaction(uid): |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5964 while True: |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5965 s = DoGet(_REMOTE, '/storage-commitment/%s' % uid) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5966 if s['Status'] != 'Pending': |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5967 return s |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5968 else: |
|
342
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
5969 time.sleep(0.01) |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5970 |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5971 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5972 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5973 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5974 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5975 # The Orthanc 0.8.6 from "_LOCAL" does not support storage commitment |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5976 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5977 'Resources' : [ i ], |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5978 'StorageCommitment' : True, |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5979 })) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5980 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5981 j = DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5982 'Resources' : [ i ], |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5983 'StorageCommitment' : False, |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5984 }) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5985 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
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 j = DoPost(_REMOTE, '/modalities/self/store', { |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5988 'Resources' : [ i ], |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5989 'StorageCommitment' : True, |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5990 }) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5991 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5992 transaction = j['StorageCommitmentTransactionUID'] |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5993 self.assertTrue(transaction.startswith('2.25.')) |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5994 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5995 result = WaitTransaction(transaction) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5996 self.assertEqual('ORTHANC', result['RemoteAET']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5997 self.assertEqual('Success', result['Status']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5998 self.assertEqual(1, len(result['Success'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5999 self.assertEqual(0, len(result['Failures'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6000 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
|
6001 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
|
6002 result['Success'][0]['SOPInstanceUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6003 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6004 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6005 DoPost(_REMOTE, '/storage-commitment/%s/remove' % transaction) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6006 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
285
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6007 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6008 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6009 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
|
6010 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6011 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6012 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6013 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f: |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6014 dicom = f.read() |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6015 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6016 self.assertRaises(Exception, lambda: DoPost( |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6017 _REMOTE, '/modalities/orthanctest/store-straight', 'nope', 'nope')) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6018 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6019 answer = DoPost(_REMOTE, '/modalities/orthanctest/store-straight', dicom, 'nope') |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6020 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6021 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
|
6022 answer['SOPClassUID']) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6023 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
|
6024 answer['SOPInstanceUID']) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6025 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6026 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6027 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
289
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6028 |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6029 |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6030 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
|
6031 # Add a RLE-encoded DICOM file |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6032 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
|
6033 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6034 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6035 rleSize = len(DoGet(_REMOTE, '/instances/%s/file' % i)) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6036 |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6037 # Export the instance, with transcoding: "_REMOTE" is the |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6038 # Orthanc server being tested |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6039 try: |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6040 DoDelete(_REMOTE, '/modalities/toto') |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6041 except: |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6042 pass |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6043 |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6044 params = DoGet(_REMOTE, '/modalities?expand') ['orthanctest'] |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6045 DoPut(_REMOTE, '/modalities/toto', params) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6046 DoPost(_REMOTE, '/modalities/toto/store', str(i), 'text/plain') |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6047 j = DoGet(_LOCAL, '/instances') |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6048 self.assertEqual(1, len(j)) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6049 uncompressedSize = len(DoGet(_LOCAL, '/instances/%s/file' % j[0])) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6050 self.assertTrue(uncompressedSize > rleSize / 2) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6051 |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6052 # Export, with transcoding disabled => this fails |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6053 params['AllowTranscoding'] = False |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6054 DoPut(_REMOTE, '/modalities/toto', params) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6055 self.assertRaises(Exception, lambda: 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
|
6056 DoDelete(_REMOTE, '/modalities/toto') |
|
290
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6057 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6058 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6059 def test_bitbucket_issue_169(self): |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6060 with open(GetDatabasePath('Issue169.dcm.bz2'), 'rb') as f: |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6061 dicom = bz2.decompress(f.read()) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6062 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6063 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
|
6064 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6065 self.assertEqual(44350560, len(dicom)) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6066 i = DoPost(_REMOTE, '/instances', dicom, 'application/dicom') ['ID'] |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6067 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6068 tags = DoGet(_REMOTE, '/instances/%s/tags' % i) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6069 self.assertEqual('NORMAL', tags['1337,1001']['Value']) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6070 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6071 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6072 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6073 j = DoGet(_LOCAL, '/instances') |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6074 self.assertEqual(1, len(j)) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6075 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6076 # 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
|
6077 # 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
|
6078 # Little Endian" (1.2.840.10008.1.2) |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6079 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax( |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6080 DoGet(_LOCAL, '/instances/%s/file' % j[0]))) |
|
290
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6081 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6082 # 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
|
6083 # because of this transcoding |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6084 tags = DoGet(_LOCAL, '/instances/%s/tags' % j[0]) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6085 self.assertEqual('NORMAL', tags['1337,1001']['Value']) |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6086 |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6087 |
|
302
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6088 def test_modify_transcode_instance(self): |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6089 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6090 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax( |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6091 DoGet(_REMOTE, '/instances/%s/file' % i))) |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6092 |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6093 a = ExtractDicomTags(DoGet(_REMOTE, '/instances/%s/file' % i), [ 'SOPInstanceUID' ]) [0] |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6094 self.assertTrue(len(a) > 20) |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6095 |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6096 SYNTAXES = [ |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6097 '1.2.840.10008.1.2', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6098 '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
|
6099 #'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
|
6100 '1.2.840.10008.1.2.2', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6101 '1.2.840.10008.1.2.4.50', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6102 '1.2.840.10008.1.2.4.51', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6103 '1.2.840.10008.1.2.4.57', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6104 '1.2.840.10008.1.2.4.70', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6105 ] |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6106 |
| 304 | 6107 if HasGdcmPlugin(_REMOTE): |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6108 SYNTAXES = SYNTAXES + [ |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6109 '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
|
6110 '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
|
6111 '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
|
6112 '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
|
6113 ] |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6114 |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6115 for syntax in SYNTAXES: |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6116 transcoded = DoPost(_REMOTE, '/instances/%s/modify' % i, { |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6117 'Transcode' : syntax, |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6118 'Keep' : [ 'SOPInstanceUID' ], |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6119 'Force' : True, |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6120 }) |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6121 |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6122 self.assertEqual(syntax, GetTransferSyntax(transcoded)) |
|
292
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6123 |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6124 b = ExtractDicomTags(transcoded, [ 'SOPInstanceUID' ]) [0] |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6125 self.assertTrue(len(b) > 20) |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6126 if syntax in [ '1.2.840.10008.1.2.4.50', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6127 '1.2.840.10008.1.2.4.51', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6128 '1.2.840.10008.1.2.4.81', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6129 '1.2.840.10008.1.2.4.91' ]: |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6130 # Lossy transcoding: The SOP instance UID must have changed |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6131 self.assertNotEqual(a, b) |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6132 else: |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6133 self.assertEqual(a, b) |
|
292
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6134 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6135 def test_archive_transcode(self): |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6136 info = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm') |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6137 |
|
293
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6138 # GET on "/media" |
|
292
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6139 z = GetArchive(_REMOTE, '/patients/%s/media' % info['ParentPatient']) |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6140 self.assertEqual(2, len(z.namelist())) |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6141 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
|
6142 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6143 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
|
6144 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6145 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
|
6146 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
|
6147 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6148 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
|
6149 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
|
6150 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6151 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
|
6152 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
|
6153 |
|
293
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6154 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6155 # POST on "/media" |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6156 self.assertRaises(Exception, lambda: PostArchive( |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6157 _REMOTE, '/patients/%s/media' % info['ParentPatient'], { 'Transcode' : 'nope' })) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6158 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6159 z = PostArchive(_REMOTE, '/patients/%s/media' % info['ParentPatient'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6160 'Transcode' : '1.2.840.10008.1.2.4.50', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6161 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6162 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
|
6163 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6164 z = PostArchive(_REMOTE, '/studies/%s/media' % info['ParentStudy'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6165 'Transcode' : '1.2.840.10008.1.2.4.51', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6166 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6167 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
|
6168 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6169 z = PostArchive(_REMOTE, '/series/%s/media' % info['ParentSeries'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6170 'Transcode' : '1.2.840.10008.1.2.4.57', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6171 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6172 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
|
6173 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6174 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6175 # GET on "/archive" |
|
292
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6176 z = GetArchive(_REMOTE, '/patients/%s/archive' % info['ParentPatient']) |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6177 self.assertEqual(1, len(z.namelist())) |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6178 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
|
6179 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6180 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
|
6181 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6182 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
|
6183 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
|
6184 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6185 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
|
6186 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
|
6187 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6188 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
|
6189 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
|
6190 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6191 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6192 # POST on "/archive" |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6193 self.assertRaises(Exception, lambda: PostArchive( |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6194 _REMOTE, '/patients/%s/archive' % info['ParentPatient'], { 'Transcode' : 'nope' })) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6195 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6196 z = PostArchive(_REMOTE, '/patients/%s/archive' % info['ParentPatient'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6197 'Transcode' : '1.2.840.10008.1.2.4.50', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6198 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6199 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
|
6200 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6201 z = PostArchive(_REMOTE, '/studies/%s/archive' % info['ParentStudy'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6202 'Transcode' : '1.2.840.10008.1.2.4.51', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6203 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6204 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
|
6205 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6206 z = PostArchive(_REMOTE, '/series/%s/archive' % info['ParentSeries'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6207 'Transcode' : '1.2.840.10008.1.2.4.57', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6208 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6209 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
|
6210 |
|
293
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6211 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6212 # "/tools/create-*" |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6213 z = PostArchive(_REMOTE, '/tools/create-archive', { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6214 'Resources' : [ info['ParentStudy'] ], |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6215 'Transcode' : '1.2.840.10008.1.2.4.50', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6216 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6217 self.assertEqual(1, len(z.namelist())) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6218 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
|
6219 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6220 z = PostArchive(_REMOTE, '/tools/create-media', { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6221 'Resources' : [ info['ParentStudy'] ], |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6222 'Transcode' : '1.2.840.10008.1.2.4.51', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6223 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6224 self.assertEqual(2, len(z.namelist())) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6225 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
|
6226 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6227 z = PostArchive(_REMOTE, '/tools/create-media-extended', { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6228 'Resources' : [ info['ParentStudy'] ], |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6229 'Transcode' : '1.2.840.10008.1.2.4.57', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6230 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6231 self.assertEqual(2, len(z.namelist())) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6232 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
|
6233 |
| 308 | 6234 |
|
301
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6235 def test_modify_keep_source(self): |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6236 # 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
|
6237 i = UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6238 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6239 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6240 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], { |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6241 'Replace' : { |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6242 'StationName' : 'TEST', |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6243 }, |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6244 'KeepSource' : True, |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6245 }) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6246 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6247 s = DoGet(_REMOTE, '/studies') |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6248 self.assertEqual(2, len(s)) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6249 self.assertTrue(i['ParentStudy'] in s) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6250 self.assertTrue(j['ID'] in s) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6251 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6252 DoDelete(_REMOTE, '/studies/%s' % j['ID']) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6253 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6254 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6255 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], { |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6256 'Replace' : { |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6257 'StationName' : 'TEST', |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6258 }, |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6259 'KeepSource' : False, |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6260 }) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6261 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6262 s = DoGet(_REMOTE, '/studies') |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6263 self.assertEqual(1, len(s)) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6264 self.assertFalse(i['ParentStudy'] in s) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6265 self.assertTrue(j['ID'] in s) |
|
302
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6266 |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6267 |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6268 def test_modify_transcode_study(self): |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6269 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm') |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6270 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
|
6271 DoGet(_REMOTE, '/instances/%s/file' % i['ID']))) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6272 |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6273 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6274 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], { |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6275 'Transcode' : '1.2.840.10008.1.2.4.50', |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6276 'KeepSource' : False |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6277 }) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6278 |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6279 k = DoGet(_REMOTE, '/instances') |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6280 self.assertEqual(1, len(k)) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6281 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
|
6282 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
|
6283 DoGet(_REMOTE, '/instances/%s/file' % k[0]))) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6284 |
|
305
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6285 |
|
498
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6286 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
|
6287 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
|
6288 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
|
6289 'Replace' : replaceTags, |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6290 'Force': force, |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6291 'KeepSource' : keepSource |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6292 }) |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6293 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6294 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
|
6295 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6296 i = UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6297 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
|
6298 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6299 # 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
|
6300 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
|
6301 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
|
6302 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6303 # 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
|
6304 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
|
6305 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
|
6306 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6307 # 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
|
6308 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
|
6309 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
|
6310 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6311 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6312 # 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
|
6313 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
|
6314 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
|
6315 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
|
6316 |
| 500 | 6317 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
|
6318 # 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
|
6319 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
|
6320 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
|
6321 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
|
6322 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6323 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6324 |
|
305
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6325 def test_store_peer_transcoding(self): |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6326 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6327 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6328 SYNTAXES = [ |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6329 '1.2.840.10008.1.2', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6330 '1.2.840.10008.1.2.1', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6331 #'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
|
6332 '1.2.840.10008.1.2.2', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6333 '1.2.840.10008.1.2.4.50', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6334 '1.2.840.10008.1.2.4.51', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6335 '1.2.840.10008.1.2.4.57', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6336 '1.2.840.10008.1.2.4.70', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6337 ] |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6338 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6339 if HasGdcmPlugin(_REMOTE): |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6340 SYNTAXES = SYNTAXES + [ |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6341 '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
|
6342 '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
|
6343 '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
|
6344 '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
|
6345 ] |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6346 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6347 for syntax in SYNTAXES: |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6348 body = { |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6349 'Resources' : [ i ], |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6350 } |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6351 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6352 if syntax != '1.2.840.10008.1.2.1': |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6353 body['Transcode'] = syntax |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6354 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6355 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6356 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6357 DoPost(_REMOTE, '/peers/peer/store', body, 'text/plain') |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6358 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6359 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6360 self.assertEqual(syntax, GetTransferSyntax( |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6361 DoGet(_LOCAL, '/instances/%s/file' % DoGet(_LOCAL, '/instances') [0]))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6362 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6363 DropOrthanc(_LOCAL) |
| 308 | 6364 |
| 6365 | |
| 295 | 6366 def test_getscu(self): |
| 307 | 6367 def CleanTarget(): |
| 6368 if os.path.isdir('/tmp/GETSCU'): | |
| 6369 shutil.rmtree('/tmp/GETSCU') | |
| 6370 os.makedirs('/tmp/GETSCU') | |
| 6371 | |
|
306
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6372 env = {} |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6373 if _DOCKER: |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6374 # 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
|
6375 # and running in a GNU/Linux distribution running DCMTK |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6376 # 3.6.0. Tell "getscu" where it can find the DICOM dictionary. |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6377 env['DCMDICTPATH'] = '/usr/share/libdcmtk2/dicom.dic' |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6378 |
| 295 | 6379 # no transcoding required |
| 307 | 6380 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] |
| 6381 | |
| 6382 CleanTarget() | |
| 295 | 6383 |
|
306
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6384 subprocess.check_call([ |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6385 FindExecutable('getscu'), |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6386 _REMOTE['Server'], |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6387 str(_REMOTE['DicomPort']), |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6388 '-aec', 'ORTHANC', |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6389 '-aet', 'ORTHANCTEST', # pretend to be the other orthanc |
| 307 | 6390 '-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
|
6391 '-k', '0008,0052=STUDY', |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6392 '--output-directory', '/tmp/GETSCU/' |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6393 ], env = env) |
| 295 | 6394 |
| 311 | 6395 f1 = '/tmp/GETSCU/MR.1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549' |
| 6396 self.assertTrue(os.path.isfile(f1)) | |
| 6397 with open(f1, 'rb') as f: | |
| 6398 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(f.read())) | |
| 6399 | |
| 307 | 6400 CleanTarget() |
| 295 | 6401 |
| 6402 # transcoding required | |
| 311 | 6403 UploadInstance(_REMOTE, 'TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm') |
| 307 | 6404 |
| 6405 subprocess.check_call([ | |
| 6406 FindExecutable('getscu'), | |
| 6407 _REMOTE['Server'], | |
| 6408 str(_REMOTE['DicomPort']), | |
| 6409 '-aec', 'ORTHANC', | |
| 6410 '-aet', 'ORTHANCTEST', # pretend to be the other orthanc | |
| 311 | 6411 '-k', '0020,000d=2.16.840.1.113669.632.20.1211.10000357775\\1.2.840.113663.1298.6234813.1.298.20000329.1115122', |
| 307 | 6412 '-k', '0008,0052=STUDY', |
| 6413 '--output-directory', '/tmp/GETSCU/' | |
| 6414 ], env = env) | |
| 6415 | |
| 311 | 6416 self.assertTrue(os.path.isfile(f1)) |
| 6417 with open(f1, 'rb') as f: | |
| 6418 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(f.read())) | |
| 6419 | |
| 6420 # This file is transcoded from "1.2.840.10008.1.2.4.50" to "1.2.840.10008.1.2.1" | |
| 6421 # (LittleEndianExplicit is proposed by default by "getscu") | |
| 6422 f2 = '/tmp/GETSCU/US.1.2.840.113663.1298.1.3.715.20000329.1115326' | |
| 6423 self.assertTrue(os.path.isfile(f2)) | |
| 6424 with open(f2, 'rb') as f: | |
| 6425 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
|
6426 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6427 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6428 def test_findscu_truncation(self): |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6429 # https://groups.google.com/forum/#!msg/orthanc-users/FkckWAHvso8/UbRBAhQ5CwAJ |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6430 # Fixed by: https://hg.orthanc-server.com/orthanc/rev/2724977419fb |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6431 UploadInstance(_REMOTE, 'Multiframe.dcm') |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6432 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6433 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6434 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
|
6435 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6436 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyInstanceUID' ]) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6437 result = re.findall('\(0020,000d\).*?\[(.*?)\]', i) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6438 self.assertEqual(2, len(result)) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6439 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6440 # 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
|
6441 # study, leading to a string of 249 characters |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6442 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6443 'StudyInstanceUID=%s\\%s\\%s\\%s\\%s' % (( study, ) * 5) ]) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6444 result = re.findall('\(0020,000d\).*?\[(.*?)\]', i) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6445 self.assertEqual(1, len(result)) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6446 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6447 # 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
|
6448 # study, leading to a string of 299 characters. In Orthanc <= |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6449 # 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
|
6450 # == 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
|
6451 # 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
|
6452 # "StudyInstanceUID" and returns all the available |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6453 # 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
|
6454 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6455 'StudyInstanceUID=%s\\%s\\%s\\%s\\%s\\%s' % (( study, ) * 6) ]) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6456 result = re.findall('\(0020,000d\).*?\[(.*?)\]', i) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6457 self.assertEqual(1, len(result)) |
|
328
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6458 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6459 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6460 def test_store_compressed(self): |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6461 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f: |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6462 dicom = f.read() |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6463 i = DoPost(_REMOTE, '/instances', dicom) ['ID'] |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6464 sourceSize = len(dicom) |
|
324
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6465 |
|
328
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6466 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6467 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6468 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6469 # 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
|
6470 jobId = MonitorJob2(_REMOTE, lambda: DoPost( |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6471 _REMOTE, '/peers/peer/store', { |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6472 'Resources' : [ i ], |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6473 'Synchronous' : False, |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6474 })) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6475 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6476 job = DoGet(_REMOTE, '/jobs/%s' % jobId) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6477 self.assertFalse(job['Content']['Compress']) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6478 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
|
6479 self.assertEqual(str(sourceSize), job['Content']['Size']) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6480 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6481 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6482 DropOrthanc(_LOCAL) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6483 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6484 # Sending to the local Orthanc 0.8.6 server, with compression: |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6485 # Not supported by Orthanc 0.8.6 => failure |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6486 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/peers/peer/store', { |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6487 'Resources' : [ i ], |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6488 'Compress' : True, |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6489 })) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6490 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6491 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6492 # Sending to the tested remote server, with compression: OK |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6493 jobId = MonitorJob2(_REMOTE, lambda: DoPost( |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6494 _REMOTE, '/peers/self/store', { |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6495 'Resources' : [ i ], |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6496 'Compress' : True, |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6497 'Synchronous' : False, |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6498 })) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6499 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6500 job = DoGet(_REMOTE, '/jobs/%s' % jobId) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6501 self.assertTrue(job['Content']['Compress']) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6502 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6503 # Compression must have divided the size of the sent data at least twice |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6504 self.assertLess(int(job['Content']['Size']), sourceSize / 2) |
| 332 | 6505 |
| 6506 | |
| 6507 def test_move_ambra(self): | |
| 6508 # "Orthanc + Ambra: Query/Retrieve" (2020-08-25) | |
| 6509 # https://groups.google.com/g/orthanc-users/c/yIUnZ9v9-Zs/m/GQPXiAOiCQAJ | |
| 6510 | |
| 6511 UploadInstance(_REMOTE, '2019-06-17-VedranZdesic.dcm') | |
| 6512 | |
| 6513 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 6514 '--study', | |
| 6515 '-k', 'StudyInstanceUID=' | |
| 6516 ]))) | |
| 6517 | |
| 6518 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 6519 '--study', | |
| 6520 '-k', 'AccessionNumber=', | |
| 6521 ]))) | |
| 6522 | |
| 6523 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 6524 '--study', | |
| 6525 '-k', 'AccessionNumber=', | |
| 6526 '-k', 'StudyInstanceUID=' | |
| 6527 ]))) | |
| 6528 | |
| 6529 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 6530 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 6531 '--study', | |
| 6532 '-k', 'AccessionNumber=CT16000988', | |
| 6533 '-k', 'StudyInstanceUID=', | |
| 6534 ]))) | |
| 6535 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 6536 DropOrthanc(_LOCAL) | |
| 6537 | |
| 6538 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 6539 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 6540 '--study', | |
| 6541 '-k', 'AccessionNumber=CT16000988', | |
| 6542 '-k', 'StudyInstanceUID=1.2.840.113619.2.278.3.4194965761.659.1468842739.39', | |
| 6543 ]))) | |
| 6544 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 6545 DropOrthanc(_LOCAL) | |
| 6546 | |
| 6547 # This fails on Orthanc <= 1.7.3 | |
| 6548 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 6549 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 6550 '--study', | |
| 6551 '-k', 'AccessionNumber=', | |
| 6552 '-k', 'StudyInstanceUID=1.2.840.113619.2.278.3.4194965761.659.1468842739.39' | |
| 6553 ]))) | |
| 6554 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 6555 DropOrthanc(_LOCAL) | |
|
333
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6556 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6557 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6558 def test_decode_elscint(self): |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6559 # 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
|
6560 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
|
6561 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
|
6562 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6563 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % a) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6564 self.assertEqual("L", im.mode) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6565 self.assertEqual(512, im.size[0]) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6566 self.assertEqual(512, im.size[1]) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6567 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6568 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % b) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6569 self.assertEqual("L", im.mode) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6570 self.assertEqual(512, im.size[0]) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6571 self.assertEqual(512, im.size[1]) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6572 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6573 # The two tests below fail on Orthanc <= 1.7.3 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6574 raw = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % a) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6575 self.assertEqual(512 * 512 * 2, len(raw)) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6576 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6577 raw = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % b) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6578 self.assertEqual(512 * 512 * 2, len(raw)) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6579 |
|
334
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
6580 |
|
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
6581 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
|
6582 # 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
|
6583 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
|
6584 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
|
6585 |
|
335
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6586 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
|
6587 modalitiesInStudy = re.findall('\(0008,0061\).*?\[(.*?)\]', i) |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6588 self.assertEqual(1, len(modalitiesInStudy)) |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6589 self.assertEqual('CT\\PT ', modalitiesInStudy[0]) |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6590 |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6591 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
|
6592 # 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
|
6593 # 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
|
6594 |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6595 if i in [ 'UX', 'UX\\MR' ]: |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6596 expected = 0 |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6597 else: |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6598 expected = 1 |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6599 |
|
334
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
6600 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
6601 'Query' : { 'ModalitiesInStudy' : i }}) |
|
335
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6602 self.assertEqual(expected, len(a)) |
|
334
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
6603 |
|
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
6604 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
|
6605 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
|
6606 self.assertEqual(expected, len(studyInstanceUid)) |
|
337
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
6607 |
|
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
6608 |
|
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
6609 def test_webdav(self): |
|
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
6610 self.assertRaises(Exception, lambda: DoPropFind(_REMOTE, '/webdav/', 2)) |
|
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
6611 |
|
342
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6612 for suffix in [ '', '/' ]: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6613 f = DoPropFind(_REMOTE, '/webdav' + suffix, 0) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6614 self.assertEqual(1, len(f)) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6615 self.assertTrue('/webdav/' in f.keys()) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6616 self.assertTrue(f['/webdav/']['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6617 self.assertEqual('webdav', f['/webdav/']['displayname']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6618 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6619 f = DoPropFind(_REMOTE, '/webdav' + suffix, 1) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6620 self.assertEqual(6, len(f)) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6621 self.assertTrue(f['/webdav/']['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6622 self.assertEqual('webdav', f['/webdav/']['displayname']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6623 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6624 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
|
6625 self.assertTrue(f['/webdav/%s' % i]['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6626 self.assertEqual(i, f['/webdav/%s' % i]['displayname']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6627 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6628 for depth in [ 0, 1 ]: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6629 for suffix2 in [ '', '/' ]: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6630 g = DoPropFind(_REMOTE, '/webdav/%s%s' % (i, suffix2), depth) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6631 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6632 if i == 'uploads': |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6633 # Empty folders might still exist in "/uploads/" |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6634 self.assertTrue('/webdav/uploads/' in g) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6635 self.assertEqual('uploads', g['/webdav/uploads/']['displayname']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6636 for j in g.items(): |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6637 self.assertTrue(g.items()[0][1]['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6638 else: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6639 self.assertEqual(1, len(g)) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6640 self.assertEqual('/webdav/%s/' % i, g.items()[0][0]) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6641 self.assertTrue(g.items()[0][1]['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6642 self.assertEqual(i, g.items()[0][1]['displayname']) |
|
341
66a36befb208
extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
337
diff
changeset
|
6643 |
|
342
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6644 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6645 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6646 DoPut(_REMOTE, '/webdav/uploads/dummy', f.read(), 'text/plain') |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6647 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6648 while len(DoGet(_REMOTE, '/patients')) == 0: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6649 time.sleep(0.01) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6650 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
337
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
6651 |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6652 |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6653 def test_log_categories(self): |
| 350 | 6654 original = DoGet(_REMOTE, '/tools/log-level-http') |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6655 |
| 350 | 6656 DoPut(_REMOTE, '/tools/log-level-http', 'default') |
| 6657 self.assertEqual('default', DoGet(_REMOTE, '/tools/log-level-http')) | |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6658 DoGet(_REMOTE, '/system') |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6659 |
| 350 | 6660 DoPut(_REMOTE, '/tools/log-level-http', 'verbose') |
| 6661 self.assertEqual('verbose', DoGet(_REMOTE, '/tools/log-level-http')) | |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6662 DoGet(_REMOTE, '/system') |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6663 |
| 350 | 6664 DoPut(_REMOTE, '/tools/log-level-http', 'trace') |
| 6665 self.assertEqual('trace', DoGet(_REMOTE, '/tools/log-level-http')) | |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6666 DoGet(_REMOTE, '/system') |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6667 |
| 350 | 6668 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
|
6669 |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6670 # Switch back to the original log level |
| 350 | 6671 DoPut(_REMOTE, '/tools/log-level-http', original) |
| 6672 | |
| 6673 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
|
6674 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
|
6675 |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6676 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/log-level-nope', 'default')) |
| 357 | 6677 |
| 6678 | |
| 6679 def test_upload_zip(self): | |
| 6680 f = StringIO() | |
| 6681 with zipfile.ZipFile(f, 'w') as z: | |
| 6682 z.writestr('hello/world/invalid.txt', 'Hello world') | |
| 6683 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as g: | |
| 6684 c = g.read() | |
| 6685 z.writestr('hello/world/dicom1.dcm', c) | |
| 6686 z.writestr('hello/world/dicom2.dcm', c) | |
| 6687 | |
| 6688 f.seek(0) | |
| 6689 i = DoPost(_REMOTE, '/instances', f.read()) | |
| 6690 | |
| 6691 self.assertEqual(2, len(i)) | |
| 6692 self.assertEqual(i[0], i[1]) | |
| 6693 self.assertEqual(6, len(i[0])) | |
| 6694 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', i[0]['ID']) | |
| 6695 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', i[0]['ParentSeries']) | |
| 6696 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', i[0]['ParentStudy']) | |
| 6697 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', i[0]['ParentPatient']) | |
| 6698 self.assertEqual('/instances/66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', i[0]['Path']) | |
| 6699 | |
| 6700 # Both are "Success" (instead of one "AlreadyStored"), because "OverwriteInstance" is true | |
| 6701 self.assertEqual('Success', i[0]['Status']) | |
|
361
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
6702 |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
6703 |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
6704 def test_transfer_syntax_no_metaheader(self): |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
6705 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
|
6706 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % a) |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
6707 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
|
6708 |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
6709 # This fails on Orthanc <= 1.8.1 |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
6710 self.assertTrue('TransferSyntax' in m) |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
6711 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
|
6712 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6713 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6714 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
|
6715 # 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
|
6716 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6717 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
|
6718 return (('--%s\r\n' + |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6719 '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
|
6720 '\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
|
6721 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6722 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
|
6723 dcm1 = f.read() |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6724 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6725 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
|
6726 dcm2 = f.read() |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6727 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6728 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
|
6729 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6730 boundary = '----WebKitFormBoundarypJDNQqJPoXiorRmQ' |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6731 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
|
6732 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
|
6733 '--' + boundary + '--'), headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6734 '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
|
6735 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6736 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6737 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6738 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
|
6739 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6740 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6741 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
|
6742 # 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
|
6743 # 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
|
6744 # "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
|
6745 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6746 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
|
6747 return (('--%s\r\n' + |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6748 '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
|
6749 '\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
|
6750 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6751 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
|
6752 dcm = f.read() |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6753 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6754 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
|
6755 dcm2 = f.read() |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6756 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6757 boundary = '----WebKitFormBoundarypJDNQqJPoXiorRmQ' |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6758 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6759 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
|
6760 m = DoPost(_REMOTE, '/instances', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6761 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
|
6762 headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6763 '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
|
6764 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6765 '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
|
6766 '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
|
6767 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6768 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6769 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
|
6770 m = DoPost(_REMOTE, '/instances', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6771 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
|
6772 headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6773 '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
|
6774 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6775 '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
|
6776 '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
|
6777 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6778 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
|
6779 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6780 m = DoPost(_REMOTE, '/instances', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6781 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
|
6782 headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6783 '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
|
6784 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6785 '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
|
6786 '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
|
6787 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6788 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6789 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
|
6790 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6791 # 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
|
6792 m = DoPost(_REMOTE, '/instances', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6793 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
|
6794 headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6795 '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
|
6796 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6797 '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
|
6798 '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
|
6799 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6800 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
6801 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
377
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
6802 |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
6803 |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
6804 def test_pixel_data_offset(self): |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
6805 # New in Orthanc 1.9.1 |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
6806 def Check(path, offset): |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
6807 i = UploadInstance(_REMOTE, path) ['ID'] |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
6808 metadata = DoGetRaw(_REMOTE, '/instances/%s/metadata/PixelDataOffset' % i) [1] |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
6809 self.assertEqual(offset, metadata) |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
6810 |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
6811 Check('ColorTestMalaterre.dcm', str(0x03a0)) |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
6812 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
|
6813 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
|
6814 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
|
6815 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
|
6816 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
|
6817 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
|
6818 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
|
6819 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
|
6820 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
|
6821 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
|
6822 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
|
6823 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
|
6824 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6825 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6826 def test_peer_store_straight(self): |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6827 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports'])) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6828 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6829 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6830 peer = DoGet(_REMOTE, '/peers/peer/system') |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6831 self.assertEqual(3, len(peer)) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6832 self.assertEqual(5, peer['DatabaseVersion']) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6833 self.assertEqual('MyOrthanc', peer['Name']) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6834 self.assertEqual('0.8.6', peer['Version']) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6835 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6836 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f: |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6837 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
|
6838 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6839 # 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
|
6840 # "ParentStudy", "ParentSeries" are not reported |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6841 self.assertEqual(3, len(j)) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6842 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
|
6843 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
|
6844 self.assertEqual('Success', j['Status']) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6845 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6846 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
6847 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
| 383 | 6848 |
| 6849 | |
| 6850 def test_cp246(self): | |
| 6851 # This fails on Orthanc <= 1.9.0 | |
| 6852 a = UploadInstance(_REMOTE, '2021-02-19-MalaterreCP246.dcm')['ID'] | |
| 6853 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 6854 | |
| 6855 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % a) | |
| 6856 self.assertEqual('1.2.840.10008.5.1.4.1.1.128', tags['0008,0016']) | |
| 6857 self.assertEqual('1.3.12.2.1107.5.1.4.36085.2.0.517715415141633', tags['0008,0018']) | |
| 6858 self.assertEqual('1.2.840.113745.101000.1008000.38179.6792.6324567', tags['0020,000d']) | |
| 6859 self.assertEqual('1.3.12.2.1107.5.1.4.36085.2.0.517714246252254', tags['0020,000e']) | |
| 6860 | |
| 6861 study = DoGet(_REMOTE, '/instances/%s/study' % a) | |
| 6862 self.assertEqual(tags['0020,000d'], study['MainDicomTags']['StudyInstanceUID']) | |
| 6863 | |
| 6864 series = DoGet(_REMOTE, '/instances/%s/series' % a) | |
| 6865 self.assertEqual(tags['0020,000e'], series['MainDicomTags']['SeriesInstanceUID']) | |
| 6866 | |
| 6867 instance = DoGet(_REMOTE, '/instances/%s' % a) | |
| 6868 self.assertEqual(tags['0008,0018'], instance['MainDicomTags']['SOPInstanceUID']) | |
| 6869 | |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6870 |
|
392
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
6871 def test_revisions_metadata(self): |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6872 # 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
|
6873 # 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
|
6874 # "CheckRevisions" is "False". Conventions for HTTP headers |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6875 # related to revisions mimic CouchDB: |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6876 # 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
|
6877 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6878 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6879 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6880 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
|
6881 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
|
6882 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
|
6883 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6884 (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
|
6885 '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
|
6886 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
6887 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
|
6888 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
6889 (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
|
6890 '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
|
6891 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
6892 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
|
6893 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
6894 (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
|
6895 'If-None-Match' : '"0-16de4d7060d0b9d102ef0fca8acc892a"' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6896 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6897 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
|
6898 self.assertEqual('"0-16de4d7060d0b9d102ef0fca8acc892a"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6899 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
|
6900 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6901 (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
|
6902 '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
|
6903 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6904 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
|
6905 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
|
6906 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
|
6907 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
6908 (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
|
6909 '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
|
6910 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
6911 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
|
6912 self.assertEqual('"0-16de4d7060d0b9d102ef0fca8acc892a"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6913 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
|
6914 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6915 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6916 self.assertEqual('403', headers['status']) # Forbidden (system metadata) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6917 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6918 (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
|
6919 self.assertEqual('403', headers['status']) # Forbidden (system metadata) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6920 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6921 (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
|
6922 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
|
6923 self.assertEqual('"0-%s"' % ComputeMD5('hello'), headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6924 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6925 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6926 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
|
6927 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6928 self.assertEqual('hello', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6929 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6930 (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
|
6931 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6932 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6933 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
|
6934 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6935 self.assertEqual('', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6936 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6937 (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
|
6938 'If-None-Match' : '"1-tata"' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6939 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6940 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
|
6941 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6942 self.assertEqual('hello', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6943 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
|
6944 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6945 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/1024' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6946 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
|
6947 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6948 (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
|
6949 'If-Match' : '45-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6950 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6951 self.assertEqual('409', headers['status']) # Conflict, as bad revision |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6952 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6953 (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
|
6954 '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
|
6955 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
6956 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
|
6957 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
6958 (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
|
6959 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6960 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6961 self.assertEqual('200', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6962 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6963 (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
|
6964 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6965 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6966 self.assertEqual('404', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6967 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6968 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6969 self.assertEqual('404', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6970 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6971 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
|
6972 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6973 (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
|
6974 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
|
6975 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6976 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6977 (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
|
6978 self.assertEqual('409', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6979 |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
6980 (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
|
6981 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6982 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6983 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
|
6984 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6985 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
|
6986 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6987 (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
|
6988 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6989 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6990 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
|
6991 self.assertEqual('"1-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6992 self.assertEqual('', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6993 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6994 (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
|
6995 'If-None-Match' : headers['etag'] |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6996 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6997 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6998 if headers['status'] == '200': |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
6999 print("Your database backend doesn't store revisions") |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7000 (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
|
7001 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7002 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7003 self.assertEqual('409', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7004 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7005 (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
|
7006 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7007 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7008 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
|
7009 self.assertEqual('"1-6e809cbda0732ac4845916a59016f954"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7010 self.assertEqual('', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7011 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7012 elif headers['status'] == '304': # Revisions are supported |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7013 (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
|
7014 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7015 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7016 self.assertEqual('409', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7017 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7018 (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
|
7019 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7020 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7021 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
|
7022 self.assertEqual('"2-6e809cbda0732ac4845916a59016f954"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7023 self.assertEqual('', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7024 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7025 else: |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7026 raise Exception('Internal error') |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7027 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7028 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
|
7029 |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7030 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7031 def test_revisions_attachments(self): |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7032 # 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
|
7033 # was introduced in 1.9.2), or if configuration option |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7034 # "CheckRevisions" is "False". Conventions for HTTP headers |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7035 # related to revisions mimic CouchDB: |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7036 # https://docs.couchdb.org/en/stable/api/document/common.html |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7037 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7038 |
|
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
|
7039 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
|
7040 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
|
7041 |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7042 # "/compress", "/uncompress" and "/verify-md5" are POST |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7043 # methods, and are not affected by revisions |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7044 for suffix in [ '', '/compressed-data', '/compressed-md5', '/compressed-size', |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7045 '/data', '/is-compressed', '/md5', '/size' ]: |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7046 (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
|
7047 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
|
7048 self.assertEqual('"0-%s"' % md5, headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7049 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7050 (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
|
7051 'If-None-Match' : '"0-3e29b869978b6db4886355a2b1132124"', |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7052 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7053 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
|
7054 self.assertEqual('"0-3e29b869978b6db4886355a2b1132124"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7055 self.assertEqual('', body) # Body must be empty on 304 status |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7056 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7057 (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
|
7058 '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
|
7059 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7060 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
|
7061 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7062 (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
|
7063 '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
|
7064 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7065 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
|
7066 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
|
7067 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7068 (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
|
7069 '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
|
7070 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7071 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
|
7072 self.assertEqual('"0-3e29b869978b6db4886355a2b1132124"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7073 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7074 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/dicom' % i) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7075 self.assertEqual('403', headers['status']) # Forbidden (system metadata) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7076 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7077 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/dicom' % i, 'hello') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7078 self.assertEqual('403', headers['status']) # Forbidden (system metadata) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7079 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7080 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7081 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
|
7082 self.assertEqual('"0-%s"' % ComputeMD5('hello'), headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7083 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7084 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7085 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
|
7086 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7087 self.assertEqual('hello', body) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7088 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7089 (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
|
7090 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7091 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7092 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
|
7093 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7094 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
|
7095 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7096 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
|
7097 '"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
|
7098 (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
|
7099 '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
|
7100 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7101 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
|
7102 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
|
7103 self.assertEqual('hello', body) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7104 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7105 (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
|
7106 'If-None-Match' : 'tata' # Bad header format |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7107 }) |
|
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
|
7108 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
|
7109 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
|
7110 |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7111 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
|
7112 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7113 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/1024' % i) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7114 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
|
7115 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7116 (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
|
7117 'If-Match' : '45-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7118 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7119 self.assertEqual('409', headers['status']) # Conflict, as bad revision |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7120 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7121 (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
|
7122 '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
|
7123 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7124 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
|
7125 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7126 (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
|
7127 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7128 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7129 self.assertEqual('200', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7130 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7131 (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
|
7132 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7133 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7134 self.assertEqual('404', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7135 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7136 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7137 self.assertEqual('404', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7138 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7139 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
|
7140 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7141 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7142 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
|
7143 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7144 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7145 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7146 self.assertEqual('409', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7147 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7148 (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
|
7149 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7150 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7151 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
|
7152 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7153 self.assertEqual('', body) # Body must be empty on 304 status |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7154 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7155 (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
|
7156 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7157 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7158 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
|
7159 self.assertEqual('"1-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7160 self.assertEqual('{}', body) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7161 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7162 (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
|
7163 'If-None-Match' : headers['etag'] |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7164 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7165 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7166 if headers['status'] == '200': |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7167 print("Your database backend doesn't store revisions") |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7168 (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
|
7169 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7170 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7171 self.assertEqual('409', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7172 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7173 (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
|
7174 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7175 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7176 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
|
7177 self.assertEqual('"1-6e809cbda0732ac4845916a59016f954"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7178 self.assertEqual('{}', body) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7179 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7180 elif headers['status'] == '304': # Revisions are supported |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7181 (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
|
7182 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7183 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7184 self.assertEqual('409', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7185 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7186 (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
|
7187 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7188 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7189 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
|
7190 self.assertEqual('"2-6e809cbda0732ac4845916a59016f954"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7191 self.assertEqual('{}', body) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7192 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7193 else: |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7194 raise Exception('Internal error') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7195 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7196 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
|
7197 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7198 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7199 def test_issue_195(self): |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7200 # This fails on Orthanc <= 1.9.2 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7201 # 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
|
7202 a = UploadInstance(_REMOTE, 'Issue195.dcm')['ID'] |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7203 b = DoGet(_REMOTE, '/instances/%s/file' % a, |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7204 headers = { 'Accept' : 'application/dicom+json' }) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7205 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7206 # 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
|
7207 self.assertEqual(5, len(b)) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7208 self.assertEqual(2, len(b["00080018"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7209 self.assertEqual("UI", b["00080018"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7210 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
|
7211 b["00080018"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7212 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7213 self.assertEqual(2, len(b["0020000D"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7214 self.assertEqual("UI", b["0020000D"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7215 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
|
7216 b["0020000D"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7217 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7218 self.assertEqual(2, len(b["0020000E"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7219 self.assertEqual("UI", b["0020000E"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7220 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
|
7221 b["0020000E"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7222 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7223 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
|
7224 self.assertEqual("LO", b["00081030"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7225 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7226 self.assertEqual(2, len(b["0008103E"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7227 self.assertEqual("LO", b["0008103E"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7228 self.assertEqual("Hello1", b["0008103E"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7229 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7230 a = UploadInstance(_REMOTE, 'Issue195-bis.dcm')['ID'] |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7231 b = DoGet(_REMOTE, '/instances/%s/file' % a, |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7232 headers = { 'Accept' : 'application/dicom+json' }) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7233 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7234 # 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
|
7235 self.assertEqual(5, len(b)) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7236 self.assertEqual(2, len(b["00080018"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7237 self.assertEqual("UI", b["00080018"]["vr"]) |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7238 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
|
7239 b["00080018"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7240 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7241 self.assertEqual(2, len(b["0020000D"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7242 self.assertEqual("UI", b["0020000D"]["vr"]) |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7243 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
|
7244 b["0020000D"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7245 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7246 self.assertEqual(2, len(b["0020000E"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7247 self.assertEqual("UI", b["0020000E"]["vr"]) |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7248 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
|
7249 b["0020000E"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7250 |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7251 self.assertEqual(2, len(b["00084567"])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7252 self.assertEqual("UN", b["00084567"]["vr"]) |
|
399
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7253 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7254 # 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
|
7255 # $ echo -n 'QgA=' | base64 -d | hexdump -C |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7256 self.assertEqual("QgA=", b["00084567"]["InlineBinary"]) |
|
399
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7257 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7258 # 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
|
7259 self.assertEqual(1, len(b["00084565"])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7260 self.assertEqual("UN", b["00084565"]["vr"]) |
|
402
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7261 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7262 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7263 def test_modify_attribute(self): |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7264 # This fails on Orthanc <= 1.9.3 (not implemented) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7265 # 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
|
7266 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7267 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7268 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % i) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7269 self.assertFalse('0020,9165' in tags) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7270 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7271 i = DoPost(_REMOTE, '/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0/modify', { |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7272 "Replace": { |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7273 "0020,9165": "0020,9056", |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7274 } |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7275 }) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7276 instances = DoGet(_REMOTE, '/studies/%s/instances' % i['ID']) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7277 self.assertEqual(1, len(instances)) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7278 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7279 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % instances[0]['ID']) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7280 self.assertTrue('0020,9165' in tags) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7281 self.assertEqual('0020,9056', tags['0020,9165']) |
| 405 | 7282 |
| 7283 | |
| 7284 def test_issue_146(self): | |
| 7285 # "Update Anonyization to 2019c" | |
| 7286 # https://bugs.orthanc-server.com/show_bug.cgi?id=146 | |
| 7287 | |
| 7288 def GetTags(study, params): | |
| 7289 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, params) ['ID'] | |
| 7290 b = DoGet(_REMOTE, '/studies/%s/instances' % a) | |
| 7291 self.assertEqual(1, len(b)) | |
| 7292 return DoGet(_REMOTE, '/instances/%s/tags?short' % b[0]['ID']) | |
| 7293 | |
| 7294 | |
| 7295 UploadInstance(_REMOTE, 'Issue146.dcm') | |
| 7296 study = '7c950970-321e4ab0-28446c5f-f94850f1-5c44634b' | |
| 7297 | |
| 7298 self.assertRaises(Exception, lambda: GetTags(study, { 'DicomVersion' : 'nope' })) | |
| 7299 | |
| 7300 tags2008 = GetTags(study, { 'DicomVersion' : '2008' }) | |
| 7301 tags2017c = GetTags(study, { 'DicomVersion' : '2017c' }) | |
| 7302 tags2021b = GetTags(study, { 'DicomVersion' : '2021b' }) | |
| 7303 tagsDefault = GetTags(study, {}) | |
| 7304 | |
| 420 | 7305 orthancVersion = DoGet(_REMOTE, '/system') ['Version'] |
| 7306 self.assertEqual('Orthanc %s - PS 3.15-2008 Table E.1-1' % orthancVersion, tags2008['0012,0063']) | |
| 7307 self.assertEqual('Orthanc %s - PS 3.15-2017c Table E.1-1 Basic Profile' % orthancVersion, tags2017c['0012,0063']) | |
| 7308 self.assertEqual('Orthanc %s - PS 3.15-2021b Table E.1-1 Basic Profile' % orthancVersion, tags2021b['0012,0063']) | |
| 405 | 7309 self.assertEqual(tagsDefault['0012,0063'], tags2021b['0012,0063']) |
| 7310 | |
| 7311 for t in [ tags2008, tags2017c, tags2021b, tagsDefault ]: | |
| 7312 self.assertTrue(t['0010,0010'].startswith('Anonymized')) | |
| 7313 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', t['0008,0016']) | |
| 7314 self.assertEqual(36, len(t['0010,0020'])) # Length of a UUID | |
| 7315 self.assertEqual('YES', t['0012,0062']) | |
| 7316 | |
| 7317 for t in [ tags2008 ]: | |
| 7318 self.assertEqual('20200101', t['0008,0020']) | |
| 7319 | |
| 7320 for t in [ tags2017c, tags2021b, tagsDefault ]: | |
| 7321 self.assertEqual('', t['0008,0020']) # Study Date, anonymized between 2008 and 2017c | |
| 7322 | |
| 7323 for t in [ tags2008, tags2017c ]: | |
| 7324 self.assertEqual('HELLO^C', t['0050,0020']) | |
| 7325 self.assertEqual('HELLO^D', t['3006,0002']) | |
| 7326 | |
| 7327 for t in [ tags2021b, tagsDefault ]: | |
| 7328 self.assertFalse('0050,0020' in t) # Device Description, anonymized between 2017c and 2019c | |
| 7329 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
|
7330 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7331 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7332 def test_anonymize_relationships_6(self): |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7333 # 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
|
7334 # 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
|
7335 # sequence containing StudyUID / Series UID of related series. |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7336 # [After anonymization,] this tag keep a reference of the |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7337 # original Study/Series UID. |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7338 # 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
|
7339 UploadInstance(_REMOTE, '2020-11-16-SalimKanounAnonymization.dcm') |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7340 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7341 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
|
7342 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
|
7343 tags['0008,1250'][0]['0020,000d']) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7344 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
|
7345 tags['0008,1250'][0]['0020,000e']) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7346 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7347 a = DoGet(_REMOTE, '/studies') |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7348 self.assertEqual(1, len(a)) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7349 b = DoPost(_REMOTE, '/studies/%s/anonymize' % a[0], {}) ['ID'] |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7350 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7351 c = DoGet(_REMOTE, '/studies/%s/instances' % b) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7352 self.assertEqual(1, len(c)) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7353 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
|
7354 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7355 # 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
|
7356 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
|
7357 tags['0008,1250'][0]['0020,000d']) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7358 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
|
7359 tags['0008,1250'][0]['0020,000e']) |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7360 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7361 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7362 def test_modify_subsequences(self): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7363 # New in Orthanc 1.9.4 (cf. LSD-629) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7364 UploadInstance(_REMOTE, 'Issue22-NoPixelData.dcm') |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7365 studies = DoGet(_REMOTE, '/studies') |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7366 self.assertEqual(1, len(studies)) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7367 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7368 def GetTags(study): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7369 instances = DoGet(_REMOTE, '/studies/%s/instances' % study) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7370 self.assertEqual(1, len(instances)) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7371 return DoGet(_REMOTE, '/instances/%s/tags?short' % instances[0]['ID']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7372 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7373 tags1 = GetTags(studies[0]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7374 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7375 a = DoPost(_REMOTE, '/studies/%s/modify' % studies[0], { |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7376 'Replace' : { |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7377 'PatientName' : 'Hello1', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7378 'DimensionIndexSequence[1].DimensionDescriptionLabel' : 'Hello2', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7379 'DimensionIndexSequence[*].PatientName' : 'Hello3', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7380 '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
|
7381 'DimensionOrganizationSequence[0].DimensionOrganizationUID' : '1.2.3.4', |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7382 }, |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7383 'Remove' : [ |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7384 'ReferencedPerformedProcedureStepSequence', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7385 'PerformedProtocolCodeSequence[0].CodeValue', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7386 'SharedFunctionalGroupsSequence[*].ReferencedImageSequence[*].ReferencedSOPInstanceUID', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7387 'SharedFunctionalGroupsSequence[*].ReferencedImageSequence[1].ReferencedSOPClassUID', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7388 'SharedFunctionalGroupsSequence[2].ReferencedImageSequence', # Inexistent tag |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7389 ] |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7390 }) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7391 tags2 = GetTags(a['ID']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7392 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7393 self.assertEqual('Anonymized1', tags1['0010,0010']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7394 self.assertEqual('Hello1', tags2['0010,0010']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7395 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7396 self.assertEqual('Stack ID', tags1['0020,9222'][0]['0020,9421']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7397 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
|
7398 self.assertEqual('Stack ID', tags2['0020,9222'][0]['0020,9421']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7399 self.assertEqual('Hello2', tags2['0020,9222'][1]['0020,9421']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7400 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7401 for i in range(3): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7402 self.assertFalse('0010,0010' in tags1['0020,9222'][i]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7403 self.assertEqual('Hello3', tags2['0020,9222'][i]['0010,0010']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7404 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7405 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
|
7406 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
|
7407 self.assertEqual('Hello4', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7408 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
|
7409 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
|
7410 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
|
7411 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7412 self.assertTrue('0008,1111' in tags1) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7413 self.assertFalse('0008,1111' in tags2) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7414 self.assertTrue('0008,0100' in tags1['0040,0260'][0]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7415 self.assertFalse('0008,0100' in tags2['0040,0260'][0]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7416 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7417 for i in range(3): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7418 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
|
7419 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
|
7420 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
|
7421 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7422 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
|
7423 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
|
7424 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
|
7425 |
|
408
4e0b9fddbc71
test "Replace" for UID in subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
7426 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
|
7427 tags1['0020,9221'][0]['0020,9164']) |
|
4e0b9fddbc71
test "Replace" for UID in subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
7428 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
|
7429 |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7430 a = DoPost(_REMOTE, '/studies/%s/anonymize' % studies[0], { |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7431 'Replace' : { |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7432 'DimensionIndexSequence[1].DimensionDescriptionLabel' : 'Hello1', |
|
408
4e0b9fddbc71
test "Replace" for UID in subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
7433 'DimensionOrganizationSequence[0].DimensionOrganizationUID' : '1.2.3.4', |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7434 }, |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7435 'Remove' : [ |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7436 'SharedFunctionalGroupsSequence[*].ReferencedImageSequence[*].ReferencedSOPInstanceUID', # 5200,9229 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7437 ], |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7438 'Keep' : [ |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7439 'ReferencedImageEvidenceSequence', # 0008,9092 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7440 'DimensionIndexSequence', # 0020,9222 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7441 'PerFrameFunctionalGroupsSequence[*].2005,140f[*].SOPInstanceUID', # 5200,9230 |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7442 '(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
|
7443 '(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
|
7444 ], |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7445 'KeepPrivateTags' : True # Compatibility with Orthanc 1.9.4 |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7446 }) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7447 tags3 = GetTags(a['ID']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7448 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7449 # UIDs |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7450 for i in [ '0008,0018', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7451 '0010,0020', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7452 '0008,0018', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7453 '0010,0020' ]: |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7454 self.assertNotEqual(tags1[i], tags3[i]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7455 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7456 self.assertNotEqual(tags1['0020,9221'][0]['0020,9164'], |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7457 tags3['0020,9221'][0]['0020,9164']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7458 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7459 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
|
7460 tags3['5200,9229'][0]['2005,140e'][0]['0008,0014']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7461 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7462 # 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
|
7463 # Removals (X) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7464 for i in [ '0008,0021', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7465 '0008,002a', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7466 '0008,0031', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7467 '0008,1030', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7468 '0008,103e', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7469 '0008,1111', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7470 '0010,21c0', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7471 '0040,0006', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7472 '0040,0241', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7473 '0040,0244', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7474 '0040,0245', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7475 '0040,0250', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7476 '0040,0251', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7477 '0040,0253', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7478 '0040,0254', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7479 '0040,0555', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7480 ]: |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7481 self.assertTrue(i in tags1) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7482 self.assertFalse(i in tags3) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7483 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7484 # Clearings (Z) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7485 for i in [ '0008,0020', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7486 '0008,0023', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7487 '0008,0030', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7488 '0008,0033' ]: |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7489 self.assertNotEqual('', tags1[i]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7490 self.assertEqual('', tags3[i]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7491 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7492 # Replace |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7493 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
|
7494 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
|
7495 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
|
7496 |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7497 # "Keep" on DimensionIndexSequence |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7498 for i in range(3): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7499 self.assertEqual(tags1['0020,9222'][i]['0020,9164'], |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7500 tags3['0020,9222'][i]['0020,9164']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7501 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7502 # "Keep" on ReferencedImageEvidenceSequence |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7503 self.assertEqual(json.dumps(tags1['0008,9092']), |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7504 json.dumps(tags3['0008,9092'])) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7505 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7506 # "Keep" on PerFrameFunctionalGroupsSequence |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7507 self.assertEqual(json.dumps(tags1['5200,9230']), |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7508 json.dumps(tags3['5200,9230'])) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7509 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7510 # "Remove" on SharedFunctionalGroupsSequence |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7511 for i in range(3): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7512 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
|
7513 self.assertFalse('0008,1155' in tags3['5200,9229'][0]['0008,1140'][i]) |
| 410 | 7514 |
| 7515 | |
| 7516 def test_bulk_modify(self): | |
| 7517 # New in Orthanc 1.9.4 | |
| 7518 | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7519 def GetModified(lst, resourceType, expectedCount = None): |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7520 m = map(lambda x: x['ID'], filter(lambda x: x['Type'] == resourceType, lst['Resources'])) |
| 410 | 7521 if expectedCount != None: |
| 7522 self.assertEqual(expectedCount, len(m)) | |
| 7523 return m | |
| 7524 | |
| 7525 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] | |
| 7526 series = DoGet(_REMOTE, '/series') [0] | |
| 7527 study = DoGet(_REMOTE, '/studies') [0] | |
| 7528 patient = DoGet(_REMOTE, '/patients') [0] | |
| 7529 | |
| 7530 a = DoPost(_REMOTE, '/tools/bulk-modify', { | |
| 7531 'Resources' : [ instance ] | |
| 7532 }) | |
| 7533 | |
| 7534 self.assertNotEqual(instance, GetModified(a, 'Instance', 1) [0]) | |
| 7535 self.assertEqual(series, GetModified(a, 'Series', 1) [0]) | |
| 7536 self.assertEqual(study, GetModified(a, 'Study', 1) [0]) | |
| 7537 self.assertEqual(patient, GetModified(a, 'Patient', 1) [0]) | |
| 7538 | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7539 b = DoPost(_REMOTE, '/tools/bulk-anonymize', { |
| 410 | 7540 'Resources' : [ instance ] |
| 7541 }) | |
| 7542 | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7543 self.assertNotEqual(instance, GetModified(b, 'Instance', 1) [0]) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7544 self.assertNotEqual(series, GetModified(b, 'Series', 1) [0]) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7545 self.assertNotEqual(study, GetModified(b, 'Study', 1) [0]) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7546 self.assertNotEqual(patient, GetModified(b, 'Patient', 1) [0]) |
| 410 | 7547 |
| 7548 self.assertEqual(3, len(DoGet(_REMOTE, '/instances'))) | |
| 7549 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 7550 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) | |
| 7551 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7552 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7553 DoPost(_REMOTE, '/tools/bulk-delete', { |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7554 'Resources' : GetModified(b, 'Patient', 1) + GetModified(a, 'Instance', 1) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7555 }) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7556 |
| 410 | 7557 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID'] |
| 7558 knee2 = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') ['ID'] | |
| 7559 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID'] | |
| 7560 | |
| 7561 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) | |
| 7562 self.assertEqual(4, len(DoGet(_REMOTE, '/series'))) | |
| 7563 self.assertEqual(3, len(DoGet(_REMOTE, '/studies'))) | |
| 7564 self.assertEqual(3, len(DoGet(_REMOTE, '/patients'))) | |
| 7565 | |
| 7566 a = DoPost(_REMOTE, '/tools/bulk-modify', { | |
| 7567 'Resources' : [ knee1, brainix ] | |
| 7568 }) | |
| 7569 | |
| 7570 self.assertEqual(6, len(DoGet(_REMOTE, '/instances'))) | |
| 7571 self.assertEqual(4, len(DoGet(_REMOTE, '/series'))) | |
| 7572 self.assertEqual(3, len(DoGet(_REMOTE, '/studies'))) | |
| 7573 self.assertEqual(3, len(DoGet(_REMOTE, '/patients'))) | |
| 7574 | |
| 7575 for i in GetModified(a, 'Instance', 2): | |
| 7576 self.assertTrue(not i in [ instance, knee1, knee2, brainix ]) | |
| 7577 self.assertTrue(DoGet(_REMOTE, '/instances/%s/metadata/ModifiedFrom' % i) in [ knee1, brainix ]) | |
| 7578 | |
| 7579 b = GetModified(a, 'Series', 2) | |
| 7580 self.assertTrue(DoGet(_REMOTE, '/instances/%s/series' % knee1) ['ID'] in b) | |
| 7581 self.assertTrue(DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'] in b) | |
| 7582 self.assertFalse(DoGet(_REMOTE, '/instances/%s/series' % knee2) ['ID'] in b) | |
| 7583 self.assertFalse(DoGet(_REMOTE, '/instances/%s/series' % instance) ['ID'] in b) | |
| 7584 | |
| 7585 b = GetModified(a, 'Study', 2) | |
| 7586 self.assertTrue(DoGet(_REMOTE, '/instances/%s/study' % knee1) ['ID'] in b) | |
| 7587 self.assertTrue(DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID'] in b) | |
| 7588 self.assertTrue(DoGet(_REMOTE, '/instances/%s/study' % knee2) ['ID'] in b) | |
| 7589 self.assertFalse(DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] in b) | |
| 7590 | |
| 7591 b = GetModified(a, 'Patient', 2) | |
| 7592 self.assertTrue(DoGet(_REMOTE, '/instances/%s/patient' % knee1) ['ID'] in b) | |
| 7593 self.assertTrue(DoGet(_REMOTE, '/instances/%s/patient' % brainix) ['ID'] in b) | |
| 7594 self.assertTrue(DoGet(_REMOTE, '/instances/%s/patient' % knee2) ['ID'] in b) | |
| 7595 self.assertFalse(DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] in b) | |
| 7596 | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7597 DoPost(_REMOTE, '/tools/bulk-delete', { |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7598 'Resources' : GetModified(a, 'Instance', 2) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7599 }) |
| 410 | 7600 |
| 7601 sourceInstances = DoGet(_REMOTE, '/instances') | |
| 7602 sourceSeries = DoGet(_REMOTE, '/series') | |
| 7603 sourceStudies = DoGet(_REMOTE, '/studies') | |
| 7604 sourcePatients = DoGet(_REMOTE, '/patients') | |
| 7605 self.assertEqual(4, len(sourceInstances)) | |
| 7606 self.assertEqual(4, len(sourceSeries)) | |
| 7607 self.assertEqual(3, len(sourceStudies)) | |
| 7608 self.assertEqual(3, len(sourcePatients)) | |
| 7609 | |
| 7610 a = DoPost(_REMOTE, '/tools/bulk-anonymize', { | |
| 7611 'Resources' : [ knee1, brainix ] | |
| 7612 }) | |
| 7613 | |
| 7614 self.assertEqual(6, len(DoGet(_REMOTE, '/instances'))) | |
| 7615 self.assertEqual(6, len(DoGet(_REMOTE, '/series'))) | |
| 7616 self.assertEqual(5, len(DoGet(_REMOTE, '/studies'))) | |
| 7617 self.assertEqual(5, len(DoGet(_REMOTE, '/patients'))) | |
| 7618 | |
| 7619 for i in GetModified(a, 'Instance', 2): | |
| 7620 self.assertFalse(i in sourceInstances) | |
| 7621 self.assertTrue(DoGet(_REMOTE, '/instances/%s/metadata/AnonymizedFrom' % i) in [ knee1, brainix ]) | |
| 7622 | |
| 7623 for i in GetModified(a, 'Series', 2): | |
| 7624 self.assertFalse(i in sourceSeries) | |
| 7625 self.assertTrue(DoGet(_REMOTE, '/series/%s/metadata/AnonymizedFrom' % i) in sourceSeries) | |
| 7626 | |
| 7627 for i in GetModified(a, 'Study', 2): | |
| 7628 self.assertFalse(i in sourceStudies) | |
| 7629 self.assertTrue(DoGet(_REMOTE, '/studies/%s/metadata/AnonymizedFrom' % i) in sourceStudies) | |
| 7630 | |
| 7631 for i in GetModified(a, 'Patient', 2): | |
| 7632 self.assertFalse(i in sourcePatients) | |
| 7633 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
|
7634 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7635 DoPost(_REMOTE, '/tools/bulk-delete', { |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7636 'Resources' : GetModified(a, 'Patient', 2) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7637 }) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7638 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7639 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7640 self.assertEqual(4, len(DoGet(_REMOTE, '/series'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7641 self.assertEqual(3, len(DoGet(_REMOTE, '/studies'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7642 self.assertEqual(3, len(DoGet(_REMOTE, '/patients'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7643 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7644 DoPost(_REMOTE, '/tools/bulk-delete', { |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7645 'Resources' : [ instance, |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7646 DoGet(_REMOTE, '/instances/%s/patient' % knee1) ['ID'], |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7647 DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'] ] |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7648 }) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7649 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7650 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7651 self.assertEqual(0, len(DoGet(_REMOTE, '/series'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7652 self.assertEqual(0, len(DoGet(_REMOTE, '/studies'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7653 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
412
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7654 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7655 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7656 def test_dicom_to_json_format(self): |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7657 # 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
|
7658 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7659 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7660 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7661 series = DoGet(_REMOTE, '/instances/%s/series' % instance) ['ID'] |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7662 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7663 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
|
7664 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
|
7665 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
|
7666 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
|
7667 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
|
7668 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
|
7669 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7670 # Test "GetInstanceHeader()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7671 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
|
7672 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
|
7673 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
|
7674 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
|
7675 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
|
7676 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
|
7677 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7678 # Test "ListResources()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7679 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
|
7680 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
|
7681 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
|
7682 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
|
7683 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7684 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
|
7685 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
|
7686 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
|
7687 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
|
7688 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7689 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
|
7690 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
|
7691 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
|
7692 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
|
7693 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7694 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
|
7695 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
|
7696 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
|
7697 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
|
7698 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7699 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
|
7700 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
|
7701 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
|
7702 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
|
7703 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7704 # Test "GetSingleResource()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7705 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
|
7706 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
|
7707 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
|
7708 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
|
7709 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7710 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
|
7711 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
|
7712 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
|
7713 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
|
7714 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7715 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
|
7716 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
|
7717 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
|
7718 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
|
7719 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7720 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
|
7721 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
|
7722 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
|
7723 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
|
7724 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7725 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
|
7726 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
|
7727 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
|
7728 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
|
7729 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7730 # Test "Find()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7731 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
|
7732 self.assertEqual('20070101', a[0]['MainDicomTags']['StudyDate']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7733 self.assertEqual('KNIX', a[0]['PatientMainDicomTags']['PatientName']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7734 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7735 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
|
7736 self.assertEqual('20070101', a[0]['MainDicomTags']['0008,0020']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7737 self.assertEqual('KNIX', a[0]['PatientMainDicomTags']['0010,0010']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7738 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7739 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
|
7740 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
|
7741 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
|
7742 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
|
7743 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
|
7744 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7745 # Test "GetChildResources()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7746 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
|
7747 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
|
7748 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
|
7749 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
|
7750 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7751 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
|
7752 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
|
7753 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
|
7754 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
|
7755 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7756 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
|
7757 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
|
7758 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
|
7759 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
|
7760 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7761 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
|
7762 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
|
7763 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
|
7764 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
|
7765 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7766 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
|
7767 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
|
7768 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
|
7769 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
|
7770 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7771 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
|
7772 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
|
7773 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
|
7774 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
|
7775 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7776 # Test "GetParentResource()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7777 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
|
7778 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
|
7779 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
|
7780 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
|
7781 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7782 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
|
7783 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
|
7784 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
|
7785 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
|
7786 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7787 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
|
7788 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
|
7789 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
|
7790 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
|
7791 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7792 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
|
7793 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
|
7794 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
|
7795 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
|
7796 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7797 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
|
7798 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
|
7799 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
|
7800 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
|
7801 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7802 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
|
7803 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
|
7804 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
|
7805 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
|
7806 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7807 # Test "GetChildInstancesTags()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7808 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
|
7809 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
|
7810 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
|
7811 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
|
7812 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7813 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
|
7814 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
|
7815 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
|
7816 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
|
7817 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7818 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
|
7819 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
|
7820 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
|
7821 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
|
7822 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7823 # Test "GetSharedTags()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7824 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
|
7825 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
|
7826 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
|
7827 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
|
7828 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7829 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
|
7830 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
|
7831 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
|
7832 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
|
7833 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7834 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
|
7835 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
|
7836 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
|
7837 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
|
7838 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7839 # Test "GetModule()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7840 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
|
7841 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
|
7842 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
|
7843 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7844 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
|
7845 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
|
7846 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
|
7847 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7848 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
|
7849 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
|
7850 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
|
7851 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7852 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
|
7853 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
|
7854 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
|
7855 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7856 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
|
7857 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
|
7858 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
|
7859 DoGet(_REMOTE, '/instances/%s/module?simplify' % instance) ['SOPInstanceUID']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7860 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
|
7861 DoGet(_REMOTE, '/instances/%s/module?short' % instance) ['0008,0018']) |
| 413 | 7862 |
| 7863 # Test "ListQueryAnswers()" in "OrthancRestModalities.cpp" | |
| 7864 a = DoPost(_REMOTE, '/modalities/self/query', { 'Level' : 'Study', | |
| 7865 'Query' : { 'PatientID' : '*' }}) ['ID'] | |
| 7866 | |
| 7867 self.assertEqual(1, len(DoGet(_REMOTE, '/queries/%s/answers' % a))) | |
| 7868 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand' % a) [0]['0010,0020']['Value']) | |
| 7869 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/answers?expand' % a) [0]['0010,0020']['Name']) | |
| 7870 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) [0]['PatientID']) | |
| 7871 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand&short' % a) [0]['0010,0020']) | |
| 7872 | |
| 7873 # Test "GetQueryOneAnswer()" in "OrthancRestModalities.cpp" | |
| 7874 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content' % a) ['0010,0020']['Value']) | |
| 7875 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/answers/0/content' % a) ['0010,0020']['Name']) | |
| 7876 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content?simplify' % a) ['PatientID']) | |
| 7877 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content?short' % a) ['0010,0020']) | |
| 7878 | |
| 7879 # Test "GetQueryArguments()" in "OrthancRestModalities.cpp" | |
| 7880 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query' % a) ['0010,0020']['Value']) | |
| 7881 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/query' % a) ['0010,0020']['Name']) | |
| 7882 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query?simplify' % a) ['PatientID']) | |
| 7883 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query?short' % a) ['0010,0020']) | |
| 7884 | |
|
414
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7885 # Test "BulkContent()" in "OrthancRestResources.cpp" |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7886 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
|
7887 self.assertEqual(4, len(a)) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7888 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['PatientID']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7889 self.assertEqual('Knee (R)', a[1]['MainDicomTags']['StudyDescription']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7890 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['PatientName']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7891 self.assertEqual('AX. FSE PD', a[2]['MainDicomTags']['SeriesDescription']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7892 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
|
7893 a[3]['MainDicomTags']['SOPInstanceUID']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7894 |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7895 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
|
7896 'Short': True }) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7897 self.assertEqual(4, len(a)) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7898 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['0010,0020']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7899 self.assertEqual('Knee (R)', a[1]['MainDicomTags']['0008,1030']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7900 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['0010,0010']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7901 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
|
7902 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
|
7903 a[3]['MainDicomTags']['0008,0018']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7904 |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7905 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
|
7906 'Full': True }) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7907 self.assertEqual(4, len(a)) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7908 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['0010,0020']['Value']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7909 self.assertEqual('PatientID', a[0]['MainDicomTags']['0010,0020']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7910 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
|
7911 self.assertEqual('StudyDescription', a[1]['MainDicomTags']['0008,1030']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7912 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['0010,0010']['Value']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7913 self.assertEqual('PatientName', a[1]['PatientMainDicomTags']['0010,0010']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7914 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
|
7915 self.assertEqual('SeriesDescription', a[2]['MainDicomTags']['0008,103e']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7916 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
|
7917 a[3]['MainDicomTags']['0008,0018']['Value']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7918 self.assertEqual('SOPInstanceUID', a[3]['MainDicomTags']['0008,0018']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
7919 |
| 415 | 7920 |
| 7921 def test_bulk_content(self): | |
| 7922 # New in Orthanc 1.9.4 | |
| 7923 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID'] | |
| 7924 knee2 = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') ['ID'] | |
| 7925 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID'] | |
| 7926 | |
| 7927 brainixHierarchy = [ | |
| 7928 DoGet(_REMOTE, '/instances/%s/patient' % brainix) ['ID'], | |
| 7929 DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID'], | |
| 7930 DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'], | |
| 7931 brainix, | |
| 7932 ] | |
| 7933 | |
| 7934 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : brainixHierarchy }) | |
| 7935 self.assertEqual(4, len(a)) | |
| 7936 b = map(lambda x: x['ID'], a) | |
| 7937 for i in range(4): | |
| 7938 self.assertEqual(brainixHierarchy[i], b[i]) | |
|
418
8a3d67a40083
test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
417
diff
changeset
|
7939 self.assertTrue('Metadata' in a[i]) |
| 415 | 7940 |
| 7941 for (level, index) in [ | |
| 7942 ('Patient', 0), | |
| 7943 ('Study', 1), | |
| 7944 ('Series', 2), | |
| 7945 ('Instance', 3), | |
| 7946 ]: | |
| 7947 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : brainixHierarchy, | |
| 7948 'Level' : level }) | |
| 7949 self.assertEqual(1, len(a)) | |
| 7950 self.assertEqual(level, a[0]['Type']) | |
| 7951 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
|
7952 self.assertTrue('Metadata' in a[0]) |
| 415 | 7953 |
| 7954 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
|
7955 'Level' : level, |
|
8a3d67a40083
test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
417
diff
changeset
|
7956 'Metadata' : False }) |
| 415 | 7957 self.assertEqual(1, len(a)) |
| 7958 self.assertEqual(level, a[0]['Type']) | |
| 7959 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
|
7960 self.assertFalse('Metadata' in a[0]) |
| 415 | 7961 |
| 7962 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, knee2, brainix ] }) | |
| 7963 self.assertEqual(3, len(a)) | |
| 7964 for item in a: | |
| 7965 self.assertEqual('Instance', item['Type']) | |
| 7966 b = map(lambda x: x['ID'], a) | |
| 7967 self.assertTrue(knee1 in b) | |
| 7968 self.assertTrue(knee2 in b) | |
| 7969 self.assertTrue(brainix in b) | |
| 7970 | |
| 7971 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, knee2 ], | |
| 7972 'Level' : 'Series' }) | |
| 7973 self.assertEqual(2, len(a)) | |
| 7974 for item in a: | |
| 7975 self.assertEqual('Series', item['Type']) | |
| 7976 b = map(lambda x: x['ID'], a) | |
| 7977 self.assertTrue(DoGet(_REMOTE, '/instances/%s' % knee1) ['ParentSeries'] in b) | |
| 7978 self.assertTrue(DoGet(_REMOTE, '/instances/%s' % knee2) ['ParentSeries'] in b) | |
| 7979 | |
| 7980 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
|
7981 'Level' : 'Study', |
|
8a3d67a40083
test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
417
diff
changeset
|
7982 'Metadata' : False }) |
| 415 | 7983 self.assertEqual(1, len(a)) |
| 7984 self.assertEqual(DoGet(_REMOTE, '/instances/%s/study' % knee1) ['ID'], a[0]['ID']) | |
| 7985 self.assertEqual('Study', a[0]['Type']) | |
| 7986 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
|
7987 self.assertFalse('Metadata' in a[0]) |
| 415 | 7988 |
| 7989 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
|
7990 'Level' : 'Patient', |
|
8a3d67a40083
test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
417
diff
changeset
|
7991 'Metadata' : True }) |
| 415 | 7992 self.assertEqual(1, len(a)) |
| 7993 self.assertEqual(DoGet(_REMOTE, '/instances/%s/patient' % knee1) ['ID'], a[0]['ID']) | |
| 7994 self.assertEqual('Patient', a[0]['Type']) | |
| 7995 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
|
7996 self.assertTrue('Metadata' in a[0]) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
7997 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
7998 self.assertEqual(2, len(a[0]['Metadata'])) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
7999 self.assertTrue('MainDicomTagsSignature' in a[0]['Metadata']) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8000 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8001 self.assertEqual(1, len(a[0]['Metadata'])) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8002 self.assertTrue('LastUpdate' in a[0]['Metadata']) |
| 415 | 8003 |
| 8004 for level in [ 'Instance', 'Series', 'Study', 'Patient' ]: | |
| 8005 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, brainix ], | |
| 8006 'Level' : level }) | |
| 8007 self.assertEqual(2, len(a)) | |
| 8008 for item in a: | |
| 8009 self.assertEqual(level, item['Type']) | |
| 8010 b = map(lambda x: x['ID'], a) | |
| 8011 if level == 'Instance': | |
| 8012 self.assertTrue(knee1 in b) | |
| 8013 self.assertTrue(brainix in b) | |
| 8014 else: | |
| 8015 self.assertTrue(DoGet(_REMOTE, '/instances/%s/%s' % (knee1, level.lower())) ['ID'] in b) | |
| 8016 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
|
8017 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8018 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8019 def test_split_instances(self): |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8020 # New in 1.9.4 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8021 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID'] |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8022 knee2 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') ['ID'] |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8023 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8024 series = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8025 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8026 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8027 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8028 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8029 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8030 instances = DoGet(_REMOTE, '/instances') |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8031 self.assertEqual(2, len(instances)) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8032 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
|
8033 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
|
8034 for i in [ knee1, knee2 ]: |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8035 self.assertEqual(series, DoGet(_REMOTE, '/instances/%s/series' % i) ['ID']) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8036 self.assertEqual(study, DoGet(_REMOTE, '/instances/%s/study' % i) ['ID']) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8037 |
| 417 | 8038 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, { |
| 8039 'KeepSource' : False | |
| 8040 })) # Neither "Instances", nor "Series" | |
| 8041 | |
| 8042 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, { | |
| 8043 'KeepSource' : False, | |
| 8044 'Instances' : [ ], | |
| 8045 'Series' : [ ] | |
| 8046 })) # Empty "Instances" and "Series" | |
| 8047 | |
| 8048 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, { | |
| 8049 'Instances' : [ 'nope' ], | |
| 8050 'KeepSource' : False | |
| 8051 })) | |
| 8052 | |
| 8053 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, { | |
| 8054 'Series' : [ 'nope' ], | |
| 8055 'KeepSource' : False | |
| 8056 })) | |
| 8057 | |
|
416
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8058 result = DoPost(_REMOTE, '/studies/%s/split' % study, { |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8059 'Instances' : [ knee1 ], |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8060 'KeepSource' : False |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8061 }) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8062 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8063 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8064 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8065 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8066 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8067 instances = DoGet(_REMOTE, '/instances') |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8068 self.assertEqual(2, len(instances)) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8069 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8070 self.assertFalse(knee1 in instances) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8071 self.assertTrue(knee2 in instances) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8072 instances.remove(knee2) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8073 self.assertEqual(series, DoGet(_REMOTE, '/instances/%s/series' % knee2) ['ID']) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8074 self.assertEqual(study, DoGet(_REMOTE, '/instances/%s/study' % knee2) ['ID']) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8075 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
|
8076 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
|
8077 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
|
8078 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8079 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8080 def test_merge_instances(self): |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8081 # New in Orthanc 1.9.4 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8082 knee = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID'] |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8083 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID'] |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8084 brainixStudy = DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID'] |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8085 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8086 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8087 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8088 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8089 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8090 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8091 instances = DoGet(_REMOTE, '/instances') |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8092 self.assertEqual(2, len(instances)) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8093 self.assertTrue(brainix in instances) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8094 self.assertTrue(knee in instances) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8095 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8096 result = DoPost(_REMOTE, '/studies/%s/merge' % brainixStudy, { |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8097 'Resources' : [ knee ] |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8098 }) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8099 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8100 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8101 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8102 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8103 self.assertEqual(brainixStudy, DoGet(_REMOTE, '/studies')[0]) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8104 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8105 instances = DoGet(_REMOTE, '/instances') |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8106 self.assertEqual(2, len(instances)) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8107 self.assertTrue(brainix in instances) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8108 self.assertFalse(knee in instances) |
|
423
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8109 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8110 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8111 def test_query_retrieve_format(self): |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8112 # New in Orthanc 1.9.5 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8113 # 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
|
8114 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
|
8115 study = DoGet(_REMOTE, '/instances/%s/study' % i) ['MainDicomTags']['StudyInstanceUID'] |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8116 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8117 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8118 'Level' : 'Study', |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8119 'Query' : {} |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8120 }) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8121 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8122 b = DoGet(_REMOTE, a['Path'] + '/answers') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8123 self.assertEqual(1, len(b)) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8124 self.assertEqual('0', b[0]) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8125 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8126 b = DoGet(_REMOTE, a['Path'] + '/answers?expand') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8127 self.assertEqual(1, len(b)) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8128 self.assertEqual(6, len(b[0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8129 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
|
8130 self.assertEqual('SpecificCharacterSet', b[0]['0008,0005']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8131 self.assertEqual('A10003245599', b[0]['0008,0050']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8132 self.assertEqual('AccessionNumber', b[0]['0008,0050']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8133 self.assertEqual('STUDY', b[0]['0008,0052']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8134 self.assertEqual('QueryRetrieveLevel', b[0]['0008,0052']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8135 self.assertEqual('ORTHANC', b[0]['0008,0054']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8136 self.assertEqual('RetrieveAETitle', b[0]['0008,0054']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8137 self.assertEqual('887', b[0]['0010,0020']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8138 self.assertEqual('PatientID', b[0]['0010,0020']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8139 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
|
8140 self.assertEqual('StudyInstanceUID', b[0]['0020,000d']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8141 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8142 for (key, value) in b[0].items(): |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8143 self.assertEqual('String', value['Type']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8144 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8145 self.assertEqual(json.dumps(b[0]), |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8146 json.dumps(DoGet(_REMOTE, a['Path'] + '/answers/0/content'))) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8147 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8148 # 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
|
8149 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8150 b = DoGet(_REMOTE, a['Path'] + '/answers?expand&short') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8151 self.assertEqual(1, len(b)) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8152 self.assertEqual(6, len(b[0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8153 self.assertEqual('ISO_IR 100', b[0]['0008,0005']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8154 self.assertEqual('A10003245599', b[0]['0008,0050']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8155 self.assertEqual('STUDY', b[0]['0008,0052']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8156 self.assertEqual('ORTHANC', b[0]['0008,0054']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8157 self.assertEqual('887', b[0]['0010,0020']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8158 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
|
8159 self.assertEqual(json.dumps(b[0]), |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8160 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
|
8161 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8162 b = DoGet(_REMOTE, a['Path'] + '/answers?expand&simplify') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8163 self.assertEqual(1, len(b)) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8164 self.assertEqual(6, len(b[0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8165 self.assertEqual('ISO_IR 100', b[0]['SpecificCharacterSet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8166 self.assertEqual('A10003245599', b[0]['AccessionNumber']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8167 self.assertEqual('STUDY', b[0]['QueryRetrieveLevel']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8168 self.assertEqual('ORTHANC', b[0]['RetrieveAETitle']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8169 self.assertEqual('887', b[0]['PatientID']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8170 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
|
8171 self.assertEqual(json.dumps(b[0]), |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8172 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
|
8173 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8174 b = DoPost(_REMOTE, '/queries/%s/retrieve' % a['ID'], {}) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8175 self.assertEqual('REST API', b['Description']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8176 self.assertEqual('ORTHANC', b['LocalAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8177 self.assertEqual('ORTHANC', b['RemoteAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8178 self.assertEqual(1, len(b['Query'])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8179 self.assertEqual(4, len(b['Query'][0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8180 self.assertEqual('A10003245599', b['Query'][0]['0008,0050']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8181 self.assertEqual('STUDY', b['Query'][0]['0008,0052']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8182 self.assertEqual('887', b['Query'][0]['0010,0020']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8183 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
|
8184 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8185 # 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
|
8186 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8187 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
|
8188 self.assertEqual('REST API', b['Description']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8189 self.assertEqual('ORTHANC', b['LocalAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8190 self.assertEqual('ORTHANC', b['RemoteAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8191 self.assertEqual(1, len(b['Query'])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8192 self.assertEqual(4, len(b['Query'][0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8193 self.assertEqual('A10003245599', b['Query'][0]['0008,0050']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8194 self.assertEqual('STUDY', b['Query'][0]['0008,0052']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8195 self.assertEqual('887', b['Query'][0]['0010,0020']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8196 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
|
8197 self.assertEqual('AccessionNumber', b['Query'][0]['0008,0050']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8198 self.assertEqual('QueryRetrieveLevel', b['Query'][0]['0008,0052']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8199 self.assertEqual('PatientID', b['Query'][0]['0010,0020']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8200 self.assertEqual('StudyInstanceUID', b['Query'][0]['0020,000d']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8201 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8202 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
|
8203 self.assertEqual('REST API', b['Description']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8204 self.assertEqual('ORTHANC', b['LocalAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8205 self.assertEqual('ORTHANC', b['RemoteAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8206 self.assertEqual(1, len(b['Query'])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8207 self.assertEqual(4, len(b['Query'][0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8208 self.assertEqual('A10003245599', b['Query'][0]['AccessionNumber']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8209 self.assertEqual('STUDY', b['Query'][0]['QueryRetrieveLevel']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8210 self.assertEqual('887', b['Query'][0]['PatientID']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8211 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
|
8212 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8213 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8214 def test_anonymize_nested(self): |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8215 # New in Orthanc 1.9.5 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8216 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8217 tags = { |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8218 'MappingResourceIdentificationSequence' : [ |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8219 { |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8220 # Test "DicomModification::RelationshipsVisitor::GetDefaultAction()" |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8221 '0009,1002' : 'ABCD', # Private tag not registered in dictionary |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8222 '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
|
8223 '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
|
8224 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8225 # Test "DicomModification::RelationshipsVisitor::VisitString()" |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8226 'StudyDescription' : 'Hello', # Removed |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8227 'StudyDate' : '20210705', # Cleared |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8228 '0009,1001' : '-1234', # Private tag whose VR is DS |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8229 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8230 # Test anonymization of nested sequences |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8231 'ReferencedStudySequence' : [ |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8232 { |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8233 'PatientID' : 'HELLO' |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8234 } |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8235 ], |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8236 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8237 # Non-anonymized tags |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8238 'CodeMeaning' : 'MEANING1', |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8239 'EquivalentCodeSequence' : [ |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8240 { |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8241 'CodeMeaning' : 'MEANING2', |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8242 } |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8243 ], |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8244 } |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8245 ], |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8246 } |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8247 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8248 a = DoPost(_REMOTE, '/tools/create-dicom', |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8249 json.dumps({ |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8250 'Tags' : tags, |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8251 'PrivateCreator' : 'Lunit', |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8252 })) ['ID'] |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8253 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8254 study = DoGet(_REMOTE, '/instances/%s/study' % a) ['ID'] |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8255 b = DoPost(_REMOTE, '/studies/%s/anonymize' % study, {}) ['ID'] |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8256 c = DoGet(_REMOTE, '/studies/%s/instances' % b) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8257 self.assertEqual(1, len(c)) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8258 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8259 tags1 = DoGet(_REMOTE, '/instances/%s/tags?short' % a) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8260 tags2 = DoGet(_REMOTE, '/instances/%s/tags?short' % c[0]['ID']) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8261 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8262 # Only "StudyDate" must be present in |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8263 # "MappingResourceIdentificationSequence" after anonymization |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8264 self.assertEqual(1, len(tags1['0008,0124'])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8265 self.assertEqual(1, len(tags2['0008,0124'])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8266 self.assertEqual(9, len(tags1['0008,0124'][0])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8267 self.assertEqual(3, len(tags2['0008,0124'][0])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8268 self.assertEqual('', tags2['0008,0124'][0]['0008,0020']) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8269 self.assertEqual('MEANING1', tags2['0008,0124'][0]['0008,0104']) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8270 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
|
8271 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8272 self.assertTrue('0008,1110' in tags1['0008,0124'][0]) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8273 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
|
8274 |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
8275 |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
8276 def test_issue_200(self): |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
8277 # 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
|
8278 # https://bugs.orthanc-server.com/show_bug.cgi?id=200 |
| 428 | 8279 self.assertEqual(0, len(DoGet(_REMOTE, '/changes') ['Changes'])) |
| 8280 self.assertEqual(0, len(DoGet(_REMOTE, '/changes?last') ['Changes'])) | |
| 429 | 8281 u = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
427
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
8282 |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
8283 for change in DoGet(_REMOTE, '/changes') ['Changes']: |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
8284 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
|
8285 self.assertTrue(re.match('[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}', change['ID'])) |
| 428 | 8286 |
| 8287 last = DoGet(_REMOTE, '/changes?last') ['Changes'] | |
| 8288 self.assertEqual(1, len(last)) | |
| 8289 self.assertTrue(re.match('[0-9]{8}T[0-9]{6}', last[0]['Date'])) | |
| 8290 self.assertTrue(re.match('[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}', last[0]['ID'])) | |
| 429 | 8291 |
| 8292 self.assertEqual(0, len(DoGet(_REMOTE, '/exports') ['Exports'])) | |
| 8293 self.assertEqual(0, len(DoGet(_REMOTE, '/exports?last') ['Exports'])) | |
| 8294 DoPost(_REMOTE, '/modalities/self/store', [ u ]) | |
| 8295 | |
| 8296 for change in DoGet(_REMOTE, '/exports') ['Exports']: | |
| 8297 self.assertTrue(re.match('[0-9]{8}T[0-9]{6}', change['Date'])) | |
| 8298 self.assertTrue(re.match('[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}', change['ID'])) | |
| 8299 | |
| 8300 last = DoGet(_REMOTE, '/exports?last') ['Exports'] | |
| 8301 self.assertEqual(1, len(last)) | |
| 8302 self.assertEqual('ozp00SjY2xG', last[0]['PatientID']) | |
| 8303 self.assertEqual('self', last[0]['RemoteModality']) | |
| 8304 self.assertEqual('Instance', last[0]['ResourceType']) | |
| 8305 self.assertEqual('/instances/%s' % last[0]['ID'], last[0]['Path']) | |
| 8306 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', last[0]['StudyInstanceUID']) | |
| 8307 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', last[0]['SeriesInstanceUID']) | |
| 8308 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', last[0]['SOPInstanceUID']) | |
| 8309 self.assertTrue(re.match('[0-9]{8}T[0-9]{6}', last[0]['Date'])) | |
| 8310 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
|
8311 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8312 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8313 def test_upload_dicomdir_archive(self): |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8314 # This test fails on Orthanc <= 1.9.6 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8315 # 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
|
8316 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8317 # Create a ZIP archive with a DICOMDIR |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8318 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8319 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8320 media = DoGet(_REMOTE, '/studies/%s/media' % study) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8321 DoDelete(_REMOTE, '/instances/%s' % instance) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8322 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8323 result = DoPost(_REMOTE, '/instances', media) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8324 self.assertEqual(1, len(result)) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8325 self.assertEqual(instance, result[0]['ID']) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8326 self.assertEqual('Success', result[0]['Status']) |
|
432
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8327 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8328 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8329 def test_modify_keep_source(self): |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8330 # 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
|
8331 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8332 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8333 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8334 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8335 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, {}) ['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8336 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8337 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8338 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8339 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8340 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
|
8341 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8342 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8343 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8344 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8345 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
|
8346 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8347 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8348 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8349 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8350 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8351 a = DoPost(_REMOTE, '/studies/%s/modify' % study, { 'Replace' : { } }) ['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8352 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8353 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8354 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8355 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8356 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
|
8357 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8358 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8359 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8360 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8361 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
|
8362 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8363 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8364 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8365 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8366 def GetStudy(a): |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8367 b = filter(lambda x: x['Type'] == 'Study', a['Resources']) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8368 if len(b) == 1: |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8369 return b[0]['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8370 else: |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8371 raise Exception() |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8372 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8373 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8374 a = GetStudy(DoPost(_REMOTE, '/tools/bulk-anonymize', { 'Resources' : [ study ]})) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8375 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8376 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8377 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8378 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8379 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
|
8380 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8381 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8382 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8383 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8384 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
|
8385 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8386 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8387 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8388 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8389 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8390 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
|
8391 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8392 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8393 # 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
|
8394 # 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
|
8395 # the original instance |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8396 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8397 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8398 # 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
|
8399 # introduced in 1.9.7 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8400 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8401 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8402 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
|
8403 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8404 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8405 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8406 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8407 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
|
8408 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8409 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8410 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8411 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8412 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
|
8413 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8414 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8415 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
433
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8416 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8417 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8418 def test_multiframe_windowing(self): |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8419 # Fixed in Orthanc 1.9.7 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8420 a = UploadInstance(_REMOTE, 'MultiframeWindowing.dcm') ['ID'] |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8421 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8422 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
|
8423 self.assertEqual(0x00, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8424 self.assertEqual(0x10, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8425 self.assertEqual(0x20, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8426 self.assertEqual(0x30, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8427 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8428 # 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
|
8429 # mid-level value (i.e. 127) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8430 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
|
8431 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8432 self.assertEqual(127, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8433 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8434 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8435 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8436 # 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
|
8437 im = GetImage(_REMOTE, '/instances/%s/frames/0/rendered' % a) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8438 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8439 self.assertEqual(127, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8440 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8441 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8442 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8443 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
|
8444 self.assertEqual(100, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8445 self.assertEqual(116, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8446 self.assertEqual(132, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8447 self.assertEqual(148, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8448 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8449 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
|
8450 self.assertEqual(0, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8451 self.assertEqual(32, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8452 self.assertEqual(64, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8453 self.assertEqual(96, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8454 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8455 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
|
8456 self.assertEqual(100, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8457 self.assertEqual(132, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8458 self.assertEqual(164, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8459 self.assertEqual(196, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8460 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8461 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
|
8462 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8463 self.assertEqual(127, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8464 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8465 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8466 |
|
436
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8467 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8468 def test_dicom_seg(self): |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8469 # This test fails in Orthanc <= 1.9.7 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8470 a = UploadInstance(_REMOTE, 'DicomSeg.dcm') ['ID'] |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8471 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8472 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
|
8473 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
|
8474 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8475 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
|
8476 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
|
8477 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8478 for i in range(96): |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8479 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
|
8480 self.assertEqual('L', im.mode) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8481 self.assertEqual(256, im.size[0]) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8482 self.assertEqual(256, im.size[1]) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8483 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8484 e = im.getextrema() |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8485 self.assertEqual(0, e[0]) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8486 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8487 if e[1] == 0: |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8488 self.assertFalse(i in nonEmptyFrames) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8489 else: |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8490 self.assertTrue(i in nonEmptyFrames) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8491 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8492 im1 = GetImage(_REMOTE, '/instances/%s/frames/44/preview' % a) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8493 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8494 # 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
|
8495 im2 = Image.open(GetDatabasePath('DicomSeg-Frame45.pgm')) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8496 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
|
8497 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8498 self.assertTrue(ImageChops.difference(im1, im2).getbbox() is None) |
| 440 | 8499 |
| 8500 | |
| 8501 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
|
8502 # New in Orthanc 1.10.0 |
| 440 | 8503 a = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] |
| 8504 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm') | |
| 8505 b = UploadInstance(_REMOTE, 'DicomSeg.dcm') ['ID'] | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8506 d = UploadInstance(_REMOTE, 'Issue124.dcm') ['ID'] |
| 440 | 8507 |
| 8508 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/0/numpy' % a))) | |
| 8509 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8510 self.assertEqual(numpy.float32, c.dtype) | |
| 8511 self.assertEqual((288, 288, 1), c.shape) | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8512 self.assertAlmostEqual(0, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8513 self.assertAlmostEqual(536, c.max()) |
| 440 | 8514 |
| 8515 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/0/numpy?rescale=0' % a))) | |
| 8516 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8517 self.assertEqual(numpy.uint16, c.dtype) | |
| 8518 self.assertEqual((288, 288, 1), c.shape) | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8519 self.assertEqual(0, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8520 self.assertEqual(536, c.max()) |
| 440 | 8521 |
| 8522 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/numpy?rescale=1&compress=false' % a))) | |
| 8523 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8524 self.assertEqual(numpy.float32, c.dtype) | |
| 8525 self.assertEqual((1, 288, 288, 1), c.shape) | |
| 8526 | |
| 8527 series = DoGet(_REMOTE, '/instances/%s/series' % a)['ID'] | |
| 8528 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/series/%s/numpy?rescale=true&compress=0' % series))) | |
| 8529 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8530 self.assertEqual(numpy.float32, c.dtype) | |
| 8531 self.assertEqual((2, 288, 288, 1), c.shape) | |
| 8532 | |
| 8533 series = DoGet(_REMOTE, '/instances/%s/series' % a)['ID'] | |
| 8534 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/series/%s/numpy?rescale=1' % series))) | |
| 8535 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8536 self.assertEqual(numpy.float32, c.dtype) | |
| 8537 self.assertEqual((2, 288, 288, 1), c.shape) | |
| 8538 | |
| 8539 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/numpy?compress' % a))) | |
| 8540 self.assertTrue(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8541 self.assertEqual(1, len(c.files)) | |
| 8542 self.assertEqual(numpy.float32, c['arr_0'].dtype) | |
| 8543 self.assertEqual((1, 288, 288, 1), c['arr_0'].shape) | |
| 8544 | |
| 8545 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/0/numpy' % b))) | |
| 8546 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8547 self.assertEqual(numpy.float32, c.dtype) | |
| 8548 self.assertEqual((256, 256, 1), c.shape) | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8549 self.assertAlmostEqual(0, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8550 self.assertAlmostEqual(0, c.max()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8551 |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8552 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
|
8553 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8554 self.assertEqual(numpy.float32, c.dtype) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8555 self.assertEqual((256, 256, 1), c.shape) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8556 self.assertAlmostEqual(0, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8557 self.assertAlmostEqual(255, c.max()) |
| 440 | 8558 |
| 8559 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/numpy' % b))) | |
| 8560 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8561 self.assertEqual(numpy.float32, c.dtype) | |
| 8562 self.assertEqual((96, 256, 256, 1), c.shape) | |
| 8563 | |
| 8564 series = DoGet(_REMOTE, '/instances/%s/series' % b)['ID'] | |
| 8565 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/series/%s/numpy' % series))) | |
| 8566 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8567 self.assertEqual(numpy.float32, c.dtype) | |
| 8568 self.assertEqual((96, 256, 256, 1), c.shape) | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8569 |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8570 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
|
8571 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8572 self.assertEqual(numpy.float32, c.dtype) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8573 self.assertEqual((512, 512, 1), c.shape) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8574 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
|
8575 self.assertAlmostEqual(2374, c.max()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8576 |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8577 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
|
8578 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8579 self.assertEqual(numpy.int16, c.dtype) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8580 self.assertEqual((512, 512, 1), c.shape) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8581 self.assertEqual(-2000, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8582 self.assertEqual(3398, c.max()) |
|
442
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8583 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8584 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8585 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
|
8586 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
|
8587 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8588 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
|
8589 "Replace" : { |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8590 "PatientName" : "MyName[*]", |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8591 "PatientID": "test_brackets" |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8592 }, |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8593 "Force": True |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8594 }), |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8595 'application/json') |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8596 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8597 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
|
8598 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8599 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
|
8600 'Query' : { 'PatientName' : 'MyName[*]' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8601 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8602 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8603 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
|
8604 'Query' : { 'PatientName' : 'MyName[*]' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8605 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8606 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8607 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
|
8608 'Query' : { 'PatientName' : 'MyName*' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8609 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8610 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8611 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
|
8612 'Query' : { 'PatientName' : 'MyName*' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8613 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8614 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8615 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
|
8616 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
|
8617 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8618 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
|
8619 "Replace" : { |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8620 "PatientName" : "MyName2[]", |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8621 "PatientID": "test_brackets2" |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8622 }, |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8623 "Force": True |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8624 }), |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8625 'application/json') |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8626 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8627 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
|
8628 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8629 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
|
8630 'Query' : { 'PatientName' : 'MyName2[*]' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8631 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8632 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8633 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
|
8634 'Query' : { 'PatientName' : 'MyName2[*]' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8635 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8636 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8637 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
|
8638 'Query' : { 'PatientName' : 'MyName2*' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8639 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8640 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8641 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
|
8642 'Query' : { 'PatientName' : 'MyName2*' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8643 self.assertEqual(1, len(a)) |
|
455
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
8644 |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
8645 |
|
452
45dd181b0f17
added test for requestedTags in tools/find + list-resources
Alain Mazy <am@osimis.io>
parents:
451
diff
changeset
|
8646 def test_rest_find_requested_tags(self): |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
8647 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): # RequestedTags introduced in 1.11.0 but Sequences allowed since 1.11.1 |
| 471 | 8648 |
| 8649 # Upload instances | |
| 8650 for i in range(2): | |
| 8651 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 8652 | |
| 8653 # Patient level | |
| 8654 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 8655 'CaseSensitive' : False, | |
| 8656 'Query' : { 'PatientName' : 'BRAINIX' }, | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
8657 'RequestedTags' : [ 'PatientName', 'PatientID', 'PatientSex', 'PatientBirthDate'], |
| 471 | 8658 'Expand': True |
| 8659 }) | |
| 8660 self.assertEqual(1, len(a)) | |
| 8661 self.assertIn('PatientName', a[0]['RequestedTags']) | |
| 8662 self.assertIn('PatientID', a[0]['RequestedTags']) | |
| 8663 self.assertIn('PatientSex', a[0]['RequestedTags']) | |
| 8664 self.assertIn('PatientBirthDate', a[0]['RequestedTags']) | |
| 8665 | |
| 8666 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 8667 self.assertEqual('5Yp0E', a[0]['RequestedTags']['PatientID']) | |
| 8668 self.assertEqual('0000', a[0]['RequestedTags']['PatientSex']) | |
| 8669 self.assertEqual('19490301', a[0]['RequestedTags']['PatientBirthDate']) | |
| 8670 | |
| 8671 # Study level, request patient tags too | |
| 8672 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 8673 'CaseSensitive' : False, | |
| 8674 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 8675 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID'], | |
| 8676 'Expand': True | |
| 8677 }) | |
| 8678 self.assertEqual(1, len(a)) | |
| 8679 self.assertIn('PatientName', a[0]['RequestedTags']) | |
| 8680 self.assertIn('StudyInstanceUID', a[0]['RequestedTags']) | |
| 8681 | |
| 8682 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 8683 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 8684 | |
| 8685 | |
| 8686 # Series level, request patient and study tags too | |
| 8687 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 8688 'CaseSensitive' : False, | |
| 8689 'Query' : { 'PatientName' : 'BRAINIX' }, | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
8690 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'RequestAttributesSequence'], |
| 471 | 8691 'Expand': True |
| 8692 }) | |
| 8693 self.assertEqual(1, len(a)) | |
| 8694 self.assertIn('PatientName', a[0]['RequestedTags']) | |
| 8695 self.assertIn('StudyInstanceUID', a[0]['RequestedTags']) | |
| 8696 self.assertIn('SeriesInstanceUID', a[0]['RequestedTags']) | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
8697 self.assertIn('RequestAttributesSequence', a[0]['RequestedTags']) |
| 471 | 8698 |
| 8699 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 8700 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 8701 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
|
8702 self.assertEqual('A10029316690', a[0]['RequestedTags']['RequestAttributesSequence'][0]['RequestedProcedureID']) |
| 471 | 8703 |
| 8704 | |
| 8705 # Instance level, request patient, study and series tags too, include tags that are not part of the main dicom tags | |
| 8706 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 8707 'CaseSensitive' : False, | |
| 8708 'Query' : { 'PatientName' : 'BRAINIX' }, | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
8709 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'PhotometricInterpretation', 'RequestAttributesSequence'], |
| 471 | 8710 'Expand': True |
| 8711 }) | |
| 8712 self.assertEqual(1, len(a)) | |
| 8713 self.assertIn('PatientName', a[0]['RequestedTags']) | |
| 8714 self.assertIn('StudyInstanceUID', a[0]['RequestedTags']) | |
| 8715 self.assertIn('SeriesInstanceUID', a[0]['RequestedTags']) | |
| 8716 self.assertIn('PhotometricInterpretation', a[0]['RequestedTags']) | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
8717 self.assertIn('RequestAttributesSequence', a[0]['RequestedTags']) |
| 471 | 8718 |
| 8719 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 8720 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 8721 self.assertEqual('1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', a[0]['RequestedTags']['SeriesInstanceUID']) | |
| 8722 self.assertEqual('MONOCHROME2', a[0]['RequestedTags']['PhotometricInterpretation']) | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
8723 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
|
8724 |
|
45dd181b0f17
added test for requestedTags in tools/find + list-resources
Alain Mazy <am@osimis.io>
parents:
451
diff
changeset
|
8725 |
|
453
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
8726 def test_rest_find_requested_tags_computed_tags(self): |
| 471 | 8727 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 8728 # Upload instances | |
| 8729 for i in range(2): | |
| 8730 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 8731 | |
| 8732 | |
| 8733 # Patient level | |
| 8734 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 8735 'CaseSensitive' : False, | |
| 8736 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 8737 'RequestedTags' : [ 'PatientName', 'NumberOfPatientRelatedStudies', 'NumberOfPatientRelatedSeries', 'NumberOfPatientRelatedInstances'], | |
| 8738 'Expand': True | |
| 8739 }) | |
| 8740 self.assertEqual(1, len(a)) | |
| 8741 | |
| 8742 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 8743 self.assertEqual('1', a[0]['RequestedTags']['NumberOfPatientRelatedStudies']) | |
| 8744 self.assertEqual('1', a[0]['RequestedTags']['NumberOfPatientRelatedSeries']) | |
| 8745 self.assertEqual('2', a[0]['RequestedTags']['NumberOfPatientRelatedInstances']) | |
| 8746 | |
| 8747 # Study level | |
| 8748 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 8749 'CaseSensitive' : False, | |
| 8750 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 8751 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'ModalitiesInStudy', 'SOPClassesInStudy', 'NumberOfStudyRelatedInstances', 'NumberOfStudyRelatedSeries'], | |
| 8752 'Expand': True | |
| 8753 }) | |
| 8754 self.assertEqual(1, len(a)) | |
| 8755 | |
| 8756 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 8757 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 8758 self.assertEqual('MR', a[0]['RequestedTags']['ModalitiesInStudy']) | |
| 8759 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', a[0]['RequestedTags']['SOPClassesInStudy']) | |
| 8760 self.assertEqual('2', a[0]['RequestedTags']['NumberOfStudyRelatedInstances']) | |
| 8761 self.assertEqual('1', a[0]['RequestedTags']['NumberOfStudyRelatedSeries']) | |
| 8762 | |
| 8763 # Series level | |
| 8764 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 8765 'CaseSensitive' : False, | |
| 8766 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 8767 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'NumberOfSeriesRelatedInstances'], | |
| 8768 'Expand': True | |
| 8769 }) | |
| 8770 self.assertEqual(1, len(a)) | |
| 8771 | |
| 8772 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 8773 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 8774 self.assertEqual('2', a[0]['RequestedTags']['NumberOfSeriesRelatedInstances']) | |
| 8775 | |
| 8776 # Instance level | |
| 8777 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', | |
| 8778 'CaseSensitive' : False, | |
| 8779 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 8780 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SOPInstanceUID', 'InstanceAvailability'], | |
| 8781 'Expand': True | |
| 8782 }) | |
| 8783 self.assertEqual(2, len(a)) | |
| 8784 | |
| 8785 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 8786 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 8787 self.assertEqual('ONLINE', a[0]['RequestedTags']['InstanceAvailability']) | |
| 456 | 8788 |
|
452
45dd181b0f17
added test for requestedTags in tools/find + list-resources
Alain Mazy <am@osimis.io>
parents:
451
diff
changeset
|
8789 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
|
8790 |
| 471 | 8791 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 8792 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] | |
| 8793 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] | |
| 8794 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] | |
| 8795 | |
| 8796 # list series and request tags that are not in the default main dicom tags | |
| 8797 a = DoGet(_REMOTE, '/studies/%s/series?expand&simplify&requestedTags=PatientName;Modality;SeriesInstanceUID;MRAcquisitionType' % study) | |
| 8798 | |
| 8799 self.assertEqual('2D', a[0]['RequestedTags']['MRAcquisitionType']) | |
| 8800 self.assertEqual('MR', a[0]['RequestedTags']['Modality']) | |
| 8801 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 8802 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID']) | |
| 8803 | |
| 8804 # list studies and request patient and studies tags | |
| 8805 a = DoGet(_REMOTE, '/patients/%s/studies?expand&simplify&requestedTags=PatientName;StudyInstanceUID' % patient) | |
| 8806 | |
| 8807 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 8808 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 8809 | |
| 8810 | |
| 8811 # list instances and request patient, studies and series tags including tags that are not in main dicom tags | |
| 8812 a = DoGet(_REMOTE, '/patients/%s/instances?expand&simplify&requestedTags=PatientName;StudyInstanceUID;SeriesInstanceUID;SOPInstanceUID;Rows;Columns;InstanceAvailability' % patient) | |
| 8813 | |
| 8814 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 8815 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID']) | |
| 8816 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a[0]['RequestedTags']['SOPInstanceUID']) | |
| 8817 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 8818 self.assertEqual('512', a[0]['RequestedTags']['Rows']) | |
| 8819 self.assertEqual('512', a[0]['RequestedTags']['Columns']) | |
| 8820 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
|
8821 |
|
453
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
8822 |
|
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
8823 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
|
8824 |
| 471 | 8825 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 8826 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] | |
| 8827 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] | |
| 8828 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] | |
| 8829 | |
| 8830 # list studies and request patient and studies tags, including ModalitiesInStudy | |
| 8831 a = DoGet(_REMOTE, '/patients/%s/studies?expand&simplify&requestedTags=PatientName;StudyInstanceUID;ModalitiesInStudy;SOPClassesInStudy;NumberOfStudyRelatedInstances;NumberOfStudyRelatedSeries' % patient) | |
| 8832 | |
| 8833 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 8834 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 8835 self.assertEqual('MR', a[0]['RequestedTags']['ModalitiesInStudy']) | |
| 8836 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', a[0]['RequestedTags']['SOPClassesInStudy']) | |
| 8837 self.assertEqual('1', a[0]['RequestedTags']['NumberOfStudyRelatedInstances']) | |
| 8838 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
|
8839 |
|
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
8840 |
|
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
8841 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
|
8842 |
| 471 | 8843 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 8844 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] | |
| 8845 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] | |
| 8846 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] | |
| 8847 | |
| 8848 # list studies and request patient and studies tags, including ModalitiesInStudy | |
| 8849 a = DoGet(_REMOTE, '/studies/%s/series?expand&simplify&requestedTags=PatientName;SeriesInstanceUID;NumberOfSeriesRelatedInstances' % study) | |
| 8850 | |
| 8851 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID']) | |
| 8852 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 8853 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
|
8854 |
|
455
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
8855 def test_dicomweb_jpeg2k_implicit(self): |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
8856 # This is a file encoded using 1.2.840.10008.1.2.4.90 transfer |
| 457 | 8857 # 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
|
8858 # representation. Support introduced in Orthanc 1.10.1. |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
8859 # 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
|
8860 a = UploadInstance(_REMOTE, '2022-03-08-RicSmi.dcm') ['ID'] |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
8861 b = DoGet(_REMOTE, '/instances/%s/file' % a, |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
8862 headers = { 'Accept' : 'application/dicom+json' }) |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
8863 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
|
8864 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
|
8865 |
|
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
|
8866 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
|
8867 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
|
8868 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
|
8869 |
|
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
|
8870 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
|
8871 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
|
8872 '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
|
8873 '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
|
8874 '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
|
8875 '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
|
8876 })) |
|
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
|
8877 |
|
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
|
8878 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
|
8879 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
|
8880 |
|
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
|
8881 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
|
8882 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
|
8883 |
|
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
|
8884 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
|
8885 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
|
8886 |
|
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
|
8887 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
|
8888 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
|
8889 self.assertEqual(j['ID'], i['ID']) |
|
501
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8890 |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8891 def test_storescu_custom_host_ip_port(self): |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8892 DropOrthanc(_LOCAL) |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8893 DropOrthanc(_REMOTE) |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8894 |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8895 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8896 |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8897 # upload to self -> orthanctest shall not receive any content |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8898 DoPost(_REMOTE, '/modalities/self/store', { |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8899 'Resources' : [ a['ID']] |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8900 }) |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8901 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8902 |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8903 # upload to self by overriding it with config from orthanctest -> orthanctest shall receive the content |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8904 c = DoGet(_REMOTE, '/modalities/orthanctest/configuration') |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8905 DoPost(_REMOTE, '/modalities/self/store', { |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8906 'LocalAet' : 'YOP', |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8907 'CalledAet' : c['AET'], |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8908 'Port' : c['Port'], |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8909 'Host' : c['Host'], |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8910 'Resources' : [ a['ID']] |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8911 }) |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8912 |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8913 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8914 |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8915 DropOrthanc(_REMOTE) |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
8916 DropOrthanc(_LOCAL) |