Mercurial > hg > orthanc-tests
annotate Tests/Tests.py @ 513:5824f0545d5b
added test_labels
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 03 Apr 2023 20:50:08 +0200 |
| parents | e2ce0edb9002 |
| children | 010cd694254b |
| 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 |
|
511
933fe1bbce4f
upgrade to year 2023
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
510
diff
changeset
|
8 # Copyright (C) 2017-2023 Osimis S.A., Belgium |
|
933fe1bbce4f
upgrade to year 2023
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
510
diff
changeset
|
9 # Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
| 3 | 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 | |
| 508 | 182 print('running : %s' % self.id()) |
| 183 | |
| 3 | 184 DropOrthanc(_LOCAL) |
| 185 DropOrthanc(_REMOTE) | |
| 174 | 186 UninstallLuaCallbacks(_REMOTE) |
|
423
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
187 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
188 # Reset stuff possibly set by some integration tests |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
189 DoPut(_REMOTE, '/tools/default-encoding', 'Latin1') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
190 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
|
191 DoPut(_REMOTE, '/tools/unknown-sop-class-accepted', '0') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
192 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
193 for i in [ 'toto', 'tata' ]: |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
194 if i in DoGet(_REMOTE, '/modalities'): |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
195 DoDelete(_REMOTE, '/modalities/%s' % i) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
196 if i in DoGet(_REMOTE, '/peers'): |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
197 DoDelete(_REMOTE, '/peers/%s' % i) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
198 |
| 312 | 199 #print("%s: In test %s" % (datetime.now(), self._testMethodName)) |
|
44
ffa542cce638
Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
200 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
201 def AssertSameImages(self, truth, url): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
202 im = GetImage(_REMOTE, url) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
203 self.assertTrue(CompareLists(truth, im.getdata())) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
204 |
| 3 | 205 |
| 206 def test_system(self): | |
| 177 | 207 self.assertTrue('Version' in DoGet(_REMOTE, '/system')) |
| 208 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 209 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 210 | |
| 512 | 211 systemInfo = DoGet(_REMOTE, '/system') |
| 212 | |
| 471 | 213 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 512 | 214 self.assertIn("MainDicomTags", systemInfo) |
| 215 self.assertIn("Patient", systemInfo["MainDicomTags"]) | |
| 216 self.assertIn("Study", systemInfo["MainDicomTags"]) | |
| 217 self.assertIn("Series", systemInfo["MainDicomTags"]) | |
| 218 self.assertIn("Instance", systemInfo["MainDicomTags"]) | |
| 219 | |
| 220 if IsOrthancVersionAbove(_REMOTE, 1, 12, 0): | |
| 221 self.assertIn("UserMetadata", systemInfo) | |
| 222 self.assertEqual(1098, systemInfo['UserMetadata']['my-metadata'] ) | |
| 223 | |
| 177 | 224 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
|
225 print("Skipping version checks since you're currently in mainline") |
| 177 | 226 return |
| 227 | |
|
509
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
228 if not IsOrthancVersionAbove(_LOCAL, 0, 8, 7): |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
229 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 8, 6)) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
230 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 8, 7)) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
231 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 7, 6)) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
232 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 9, 6)) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
233 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 1, 8, 6)) |
| 3 | 234 |
| 456 | 235 |
| 512 | 236 |
| 3 | 237 def test_upload(self): |
| 173 | 238 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) |
| 239 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 240 | |
| 241 sizeDummyCT = 2472 | |
| 242 sizeOverwrite = 2476 | |
| 243 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d' | |
| 244 | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
245 # This file has *no* pixel data => "dicom-until-pixel-data" is not created |
| 3 | 246 u = UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
247 isCompressed = (DoGet(_REMOTE, '/instances/%s/attachments/dicom/is-compressed' % u['ID']) != 0) |
| 183 | 248 self.assertEqual(instance, u['ID']) |
| 3 | 249 self.assertEqual('Success', u['Status']) |
| 173 | 250 |
| 183 | 251 if True: |
| 252 # New test for Orthanc 1.4.3 | |
| 253 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', u['ParentSeries']) | |
| 254 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', u['ParentStudy']) | |
| 255 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', u['ParentPatient']) | |
| 256 | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
257 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
258 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
|
259 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
|
260 j = 0 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
261 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
262 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/attachments/dicom-until-pixel-data' % instance)) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
263 j = 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
|
264 |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
265 if IsOrthancVersionAbove(_REMOTE, 1, 10, 0): |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
266 attachmentInfo = DoGet(_REMOTE, '/instances/%s/attachments/dicom/info' % instance) |
| 447 | 267 |
| 268 if isCompressed: | |
| 269 self.assertGreater(sizeDummyCT, attachmentInfo['CompressedSize']) | |
| 270 else: | |
| 271 self.assertEqual(sizeDummyCT, attachmentInfo['CompressedSize']) | |
| 272 | |
|
445
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
273 self.assertEqual(sizeDummyCT, attachmentInfo['UncompressedSize']) |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
274 self.assertIn('Uuid', attachmentInfo) |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
275 self.assertEqual(1, attachmentInfo['ContentType']) |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
276 |
| 173 | 277 s = sizeDummyCT + j |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
278 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
279 if isCompressed: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
280 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
|
281 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
282 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
|
283 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
284 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 173 | 285 |
| 3 | 286 u = UploadInstance(_REMOTE, 'DummyCT.dcm') |
| 287 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 288 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 289 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 290 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
|
291 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
292 if isCompressed: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
293 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
|
294 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
295 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
|
296 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
297 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 173 | 298 |
| 299 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance) | |
| 3 | 300 self.assertEqual('20070101', i['StudyDate']) |
| 173 | 301 self.assertEqual('KNIX', i['PatientName']) |
| 302 | |
| 303 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2): | |
| 304 # Overwriting | |
| 305 self.assertEqual('Success', u['Status']) | |
| 306 else: | |
| 307 self.assertEqual('AlreadyStored', u['Status']) | |
| 308 | |
| 309 u = UploadInstance(_REMOTE, 'DummyCT-overwrite.dcm') | |
| 310 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 311 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 312 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 313 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 314 | |
| 315 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2): | |
| 316 # Overwriting | |
| 317 self.assertEqual('Success', u['Status']) | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
318 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
319 j2 = 0 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
320 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
321 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
|
322 self.assertNotEqual(j, j2) |
| 173 | 323 s2 = sizeOverwrite + j2 |
| 324 self.assertNotEqual(s, s2) | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
325 if isCompressed: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
326 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
|
327 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
328 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
|
329 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
330 self.assertEqual(s2, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 173 | 331 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance) |
| 332 self.assertEqual('ANOTHER', i['PatientName']) | |
| 333 else: | |
| 334 self.assertEqual('AlreadyStored', u['Status']) | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
335 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
|
336 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 3 | 337 |
| 5 | 338 def test_upload_2(self): |
| 3 | 339 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
| 340 instance = DoGet(_REMOTE, '/instances/%s' % i) | |
| 341 self.assertEqual(i, instance['ID']) | |
| 342 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', | |
| 343 instance['MainDicomTags']['SOPInstanceUID']) | |
| 344 | |
| 345 series = DoGet(_REMOTE, '/series/%s' % instance['ParentSeries']) | |
| 346 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 347 series['MainDicomTags']['SeriesInstanceUID']) | |
| 348 | |
| 349 study = DoGet(_REMOTE, '/studies/%s' % series['ParentStudy']) | |
| 350 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 351 study['MainDicomTags']['StudyInstanceUID']) | |
| 352 | |
| 353 patient = DoGet(_REMOTE, '/patients/%s' % study['ParentPatient']) | |
| 354 self.assertEqual('ozp00SjY2xG', | |
| 355 patient['MainDicomTags']['PatientID']) | |
| 356 | |
| 357 dicom = DoGet(_REMOTE, '/instances/%s/file' % instance['ID']) | |
| 358 self.assertEqual(2472, len(dicom)) | |
| 359 self.assertEqual('3e29b869978b6db4886355a2b1132124', ComputeMD5(dicom)) | |
| 360 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 361 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/simplified-tags' % i)['StationName']) | |
| 362 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
|
363 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
|
364 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/tags?short' % i)['0008,1010']) |
| 3 | 365 |
| 366 | |
| 5 | 367 def test_images(self): |
| 368 i = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID'] | |
| 369 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 3 | 370 |
| 5 | 371 im = GetImage(_REMOTE, '/instances/%s/preview' % i) |
| 372 self.assertEqual("L", im.mode) | |
| 373 self.assertEqual(512, im.size[0]) | |
| 374 self.assertEqual(358, im.size[1]) | |
| 375 | |
| 376 im = GetImage(_REMOTE, '/instances/%s/image-uint8' % i) | |
| 377 self.assertEqual("L", im.mode) | |
| 378 self.assertEqual(512, im.size[0]) | |
| 379 self.assertEqual(358, im.size[1]) | |
| 380 | |
| 381 im = GetImage(_REMOTE, '/instances/%s/image-uint16' % i) | |
| 382 self.assertEqual(512, im.size[0]) | |
| 383 self.assertEqual(358, im.size[1]) | |
| 384 | |
| 385 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i) | |
| 386 self.assertEqual("L", im.mode) | |
| 387 self.assertEqual(512, im.size[0]) | |
| 388 self.assertEqual(358, im.size[1]) | |
| 389 | |
| 390 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint8' % i) | |
| 391 self.assertEqual("L", im.mode) | |
| 392 self.assertEqual(512, im.size[0]) | |
| 393 self.assertEqual(358, im.size[1]) | |
| 394 | |
| 395 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint16' % i) | |
| 396 self.assertEqual(512, im.size[0]) | |
| 397 self.assertEqual(358, im.size[1]) | |
| 64 | 398 |
| 399 # This is Little Endian Explicit | |
| 400 self.assertEqual('1.2.840.10008.1.2.1', DoGet(_REMOTE, '/instances/%s/header?simplify' % i)['TransferSyntaxUID']) | |
| 401 | |
|
464
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
402 def test_images_implicit_vr(self): |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
403 if IsOrthancVersionAbove(_REMOTE, 1, 10, 2): |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
404 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
|
405 |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
406 im = GetImage(_REMOTE, '/instances/%s/preview' % i) |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
407 self.assertEqual("RGB", im.mode) |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
408 self.assertEqual(800, im.size[0]) |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
409 self.assertEqual(600, im.size[1]) |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
410 |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
411 |
| 6 | 412 def test_hierarchy(self): |
| 413 UploadFolder(_REMOTE, 'Brainix/Epi') | |
| 414 UploadFolder(_REMOTE, 'Brainix/Flair') | |
| 415 UploadFolder(_REMOTE, 'Knee/T1') | |
| 416 UploadFolder(_REMOTE, 'Knee/T2') | |
| 417 | |
| 418 p = DoGet(_REMOTE, '/patients') | |
| 419 s = DoGet(_REMOTE, '/studies') | |
| 420 t = DoGet(_REMOTE, '/series') | |
| 421 self.assertEqual(2, len(p)) | |
| 422 self.assertEqual(2, len(s)) | |
| 423 self.assertEqual(4, len(t)) | |
| 424 self.assertEqual(94, len(DoGet(_REMOTE, '/instances'))) | |
| 425 | |
| 426 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0' | |
| 427 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' | |
| 428 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8' | |
| 429 brainixFlair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' | |
| 430 | |
| 431 kneePatient = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' | |
| 432 kneeStudy = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' | |
| 433 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' | |
| 434 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' | |
| 435 | |
| 436 self.assertTrue(brainixPatient in p) | |
| 437 self.assertTrue(kneePatient in p) | |
| 438 self.assertTrue(brainixStudy in s) | |
| 439 self.assertTrue(kneeStudy in s) | |
| 440 self.assertTrue(brainixEpi in t) | |
| 441 self.assertTrue(brainixFlair in t) | |
| 442 self.assertTrue(kneeT1 in t) | |
| 443 self.assertTrue(kneeT2 in t) | |
| 444 | |
| 445 self.assertEqual(44, len(DoGet(_REMOTE, '/patients/%s/instances' % brainixPatient))) | |
| 446 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % brainixPatient))) | |
| 447 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % brainixPatient))) | |
| 448 | |
| 449 self.assertEqual(50, len(DoGet(_REMOTE, '/patients/%s/instances' % kneePatient))) | |
| 450 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % kneePatient))) | |
| 451 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % kneePatient))) | |
| 452 | |
| 453 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % brainixStudy))) | |
| 454 self.assertEqual(44, len(DoGet(_REMOTE, '/studies/%s/instances' % brainixStudy))) | |
| 455 | |
| 456 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % kneeStudy))) | |
| 457 self.assertEqual(50, len(DoGet(_REMOTE, '/studies/%s/instances' % kneeStudy))) | |
| 458 | |
| 459 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixEpi))) | |
| 460 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixFlair))) | |
| 461 self.assertEqual(24, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT1))) | |
| 462 self.assertEqual(26, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT2))) | |
| 463 | |
| 464 for patient in p: | |
| 465 for study in DoGet(_REMOTE, '/patients/%s/studies' % patient): | |
| 466 self.assertEqual(patient, study['ParentPatient']) | |
| 467 for series in DoGet(_REMOTE, '/studies/%s/series' % study['ID']): | |
| 468 self.assertEqual(study['ID'], series['ParentStudy']) | |
| 211 | 469 self.assertEqual('Unknown', series['Status']) |
| 6 | 470 for instance in DoGet(_REMOTE, '/series/%s/instances' % series['ID']): |
| 471 self.assertEqual(series['ID'], instance['ParentSeries']) | |
| 472 | |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
473 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
|
474 # 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
|
475 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
|
476 json.dumps(DoGet(_REMOTE, '/instances/%s/tags' % instance['ID']))) |
| 6 | 477 |
| 478 | |
| 479 r = DoDelete(_REMOTE, "/studies/%s" % brainixStudy)['RemainingAncestor'] | |
| 480 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 481 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 482 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 483 self.assertEqual(50, len(DoGet(_REMOTE, '/instances'))) | |
| 484 self.assertEqual(None, r) | |
| 485 | |
| 486 r = DoDelete(_REMOTE, "/series/%s" % kneeT2)['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(24, len(DoGet(_REMOTE, '/instances'))) | |
| 491 self.assertEqual('Study', r['Type']) | |
| 492 self.assertEqual(kneeStudy, r['ID']) | |
| 493 | |
| 494 r = DoDelete(_REMOTE, "/instances/%s" % DoGet(_REMOTE, '/instances')[0])['RemainingAncestor'] | |
| 495 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 496 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 497 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 498 self.assertEqual(23, len(DoGet(_REMOTE, '/instances'))) | |
| 499 self.assertEqual('Series', r['Type']) | |
| 500 self.assertEqual(kneeT1, r['ID']) | |
| 501 | |
| 502 r = DoDelete(_REMOTE, "/patients/%s" % kneePatient)['RemainingAncestor'] | |
| 503 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 504 self.assertEqual(0, len(DoGet(_REMOTE, '/studies'))) | |
| 505 self.assertEqual(0, len(DoGet(_REMOTE, '/series'))) | |
| 506 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 507 self.assertEqual(None, r) | |
| 508 | |
| 509 DropOrthanc(_REMOTE) | |
| 510 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 511 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 7 | 512 |
|
213
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
513 def test_delete_cascade(self): |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
514 # 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
|
515 |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
516 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
|
517 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
|
518 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
|
519 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
|
520 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
|
521 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
|
522 |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
523 DoDelete(_REMOTE, '/instances/%s' % a) |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
524 |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
525 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
|
526 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
|
527 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
|
528 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
|
529 |
| 7 | 530 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
531 def test_multiframe(self): |
| 7 | 532 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] |
| 533 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 534 | |
| 535 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i) | |
| 536 self.assertEqual("L", im.mode) | |
| 537 self.assertEqual(512, im.size[0]) | |
| 538 self.assertEqual(512, im.size[1]) | |
| 539 | |
| 540 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint8' % i) | |
| 541 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint16' % i) | |
| 542 DoGet(_REMOTE, '/instances/%s/frames/75/preview' % i) | |
| 543 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/aaa/preview' % i)) | |
| 544 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/76/preview' % i)) | |
| 545 | |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
546 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
547 def test_changes(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
548 # Check emptiness |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
549 c = DoGet(_REMOTE, '/changes') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
550 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
|
551 #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
|
552 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
553 c = DoGet(_REMOTE, '/changes?last') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
554 self.assertEqual(0, len(c['Changes'])) |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
555 #self.assertEqual(0, c['Last']) # Not true anymore for Orthanc >= 1.5.2 |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
556 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
557 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
558 # Add 1 instance |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
559 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
|
560 c = DoGet(_REMOTE, '/changes') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
561 begin = c['Last'] |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
562 self.assertEqual(4, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
563 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
564 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
|
565 |
|
390
5c2472f008eb
Check the order in which the creation events are reported
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
389
diff
changeset
|
566 # 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
|
567 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
|
568 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
|
569 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
|
570 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
|
571 |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
572 c = DoGet(_REMOTE, '/changes?last') |
|
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, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
575 self.assertTrue(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 - 1)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
577 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
578 self.assertEqual(begin, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
579 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
580 c = DoGet(_REMOTE, '/changes?limit=1&since=' + str(begin - 2)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
581 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
582 self.assertEqual(begin - 1, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
583 self.assertFalse(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
584 c = DoGet(_REMOTE, '/changes?limit=1&since=' + str(begin - 3)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
585 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
586 self.assertEqual(begin - 2, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
587 self.assertFalse(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
588 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
589 UploadFolder(_REMOTE, 'Knee/T1') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
590 UploadFolder(_REMOTE, 'Knee/T2') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
591 since = begin |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
592 countPatients = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
593 countStudies = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
594 countSeries = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
595 countInstances = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
596 completed = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
597 while True: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
598 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
|
599 since = c['Last'] |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
600 for i in c['Changes']: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
601 if i['ResourceType'] == 'Instance': |
|
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['ResourceType'] == 'Patient': |
|
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['ResourceType'] == 'Study': |
|
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['ResourceType'] == 'Series': |
|
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'] == 'NewInstance': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
610 countInstances += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
611 if i['ChangeType'] == 'NewPatient': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
612 countPatients += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
613 if i['ChangeType'] == 'NewStudy': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
614 countStudies += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
615 if i['ChangeType'] == 'NewSeries': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
616 countSeries += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
617 if i['ChangeType'] == 'CompletedSeries': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
618 completed += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
619 self.assertTrue('ID' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
620 self.assertTrue('Path' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
621 self.assertTrue('Seq' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
622 if c['Done']: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
623 break |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
624 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
625 self.assertEqual(2 * 50, countInstances) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
626 self.assertEqual(2 * 1, countPatients) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
627 self.assertEqual(2 * 1, countStudies) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
628 self.assertEqual(2 * 2, countSeries) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
629 self.assertEqual(0, completed) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
630 |
|
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 def test_archive(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
633 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
|
634 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') |
| 192 | 635 knee = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' |
| 636 | |
| 637 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
|
638 self.assertEqual(2, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
639 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
640 z = GetArchive(_REMOTE, '/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
|
641 self.assertEqual(2, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
642 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
643 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
|
644 self.assertEqual(1, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
645 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
646 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') |
| 192 | 647 brainix = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0' |
| 648 | |
| 649 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
|
650 self.assertEqual(2, len(z.namelist())) |
| 192 | 651 |
| 652 z = PostArchive(_REMOTE, '/tools/create-archive', { | |
| 653 'Resources' : [ brainix, knee ] | |
| 654 }) | |
| 655 self.assertEqual(3, len(z.namelist())) | |
|
403
e08e15befa0c
test sync POST to /archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
656 |
|
e08e15befa0c
test sync POST to /archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
657 z = PostArchive(_REMOTE, '/patients/%s/archive' % knee, { |
|
e08e15befa0c
test sync POST to /archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
658 'Synchronous' : True |
|
e08e15befa0c
test sync POST to /archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
659 }) |
|
e08e15befa0c
test sync POST to /archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
660 self.assertEqual(2, len(z.namelist())) |
| 192 | 661 |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
662 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
663 def test_media_archive(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
664 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
|
665 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
|
666 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
667 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
|
668 self.assertEqual(3, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
669 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
|
670 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
|
671 self.assertTrue('DICOMDIR' in z.namelist()) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
672 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
673 try: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
674 os.remove('/tmp/DICOMDIR') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
675 except: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
676 # The file does not exist |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
677 pass |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
678 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
679 z.extract('DICOMDIR', '/tmp') |
| 45 | 680 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
|
681 stderr = subprocess.STDOUT).split('\n') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
682 self.assertEqual(3, len(a)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
683 self.assertTrue(a[0].startswith('Warning')) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
684 self.assertEqual('BasicDirectory', a[1]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
685 self.assertEqual('', a[2]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
686 |
| 45 | 687 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
|
688 stderr = subprocess.STDOUT).split('\n') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
689 self.assertEqual(1, len(a)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
690 self.assertEqual('', a[0]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
691 |
| 45 | 692 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
|
693 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
|
694 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
|
695 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
696 os.remove('/tmp/DICOMDIR') |
| 10 | 697 |
| 698 | |
| 699 def test_protection(self): | |
| 700 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 701 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 702 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 703 a = DoGet(_REMOTE, '/patients')[0] | |
| 704 b = DoGet(_REMOTE, '/patients')[1] | |
| 705 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 706 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain') | |
| 707 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 708 DoPut(_REMOTE, '/patients/%s/protected' % a, '1', 'text/plain') | |
| 709 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 710 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain') | |
| 711 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 712 | |
| 713 | |
| 12 | 714 def test_raw_tags(self): |
| 10 | 715 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] |
| 716 | |
| 717 dicom = DoGet(_REMOTE, '/instances/%s/file' % i) | |
| 718 self.assertEqual('1a7c56cb02d6e742cc9c856a8ac182e3', ComputeMD5(dicom)) | |
| 719 | |
| 720 s = '/instances/%s/content/' % i | |
| 721 | |
| 722 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, s + '0008-1010').strip()) | |
| 723 self.assertRaises(Exception, lambda: DoGet(_REMOTE, s + '0008-1011')) | |
| 724 | |
| 725 self.assertEqual('Abdomen', DoGet(_REMOTE, s + '7fe1-1001/0/7fe1-1008/0/7fe1-1057').strip()) | |
| 726 self.assertEqual('cla_3c', DoGet(_REMOTE, s + '7fe1-1001/0/7fe1-1008/8/7fe1-1057').strip()) | |
| 727 | |
| 728 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 729 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 730 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 731 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 732 | |
| 733 for i in DoGet(_REMOTE, '/instances'): | |
| 734 aid = DoGet(_REMOTE, '/instances/%s' % i)['MainDicomTags']['SOPInstanceUID'] | |
| 735 self.assertEqual(aid, DoGet(_REMOTE, '/instances/%s/content/0008-0018' % i).replace(chr(0), '')) | |
| 736 | |
| 737 | |
| 738 def test_raw_tags_mdn(self): | |
| 739 # Bug reported by Cyril Paulus | |
| 740 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] | |
| 741 self.assertAlmostEqual(0.000027, DoGet(_REMOTE, '/instances/%s/content/7053-1000' % i)) | |
| 742 | |
| 743 | |
| 744 def test_modify_instance(self): | |
| 745 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] | |
| 746 modified = DoPost(_REMOTE, '/instances/%s/modify' % i, | |
| 747 json.dumps({ | |
| 748 "Replace" : { | |
| 749 "PatientName" : "hello", | |
| 750 #"PatientID" : "world" | |
| 751 }, | |
| 752 "Remove" : [ "StationName" ], | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
753 "RemovePrivateTags" : True |
| 10 | 754 }), |
| 755 'application/json') | |
| 756 j = DoPost(_REMOTE, '/instances', modified, 'application/dicom')['ID'] | |
| 757 | |
| 758 self.assertNotEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 759 #self.assertNotEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % i).strip()) | |
| 83 | 760 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i).strip()) |
| 10 | 761 DoGet(_REMOTE, '/instances/%s/content/6003-1010' % i) # Some private tag |
| 762 | |
| 763 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 764 #self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % j).strip()) | |
| 765 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j)) | |
| 766 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/6003-1010' % j)) | |
| 767 | |
| 768 | |
| 769 def test_modify_series(self): | |
| 770 # Upload 4 images from the same series | |
| 771 for i in range(4): | |
| 772 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 773 | |
| 774 origSeries = DoGet(_REMOTE, '/series')[0] | |
| 775 newSeries = DoPost(_REMOTE, '/series/%s/modify' % origSeries, | |
| 776 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 777 'application/json')['ID'] | |
| 778 | |
| 779 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['ModifiedFrom']) | |
| 780 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances'] | |
| 781 self.assertEqual(4, len(instances)) | |
| 782 for i in instances: | |
| 783 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom'] | |
| 784 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 785 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 786 | |
| 787 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 788 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 789 | |
| 790 | |
| 791 def test_modify_study(self): | |
| 792 # Upload 4 images from the 2 series of the same study | |
| 793 for i in range(4): | |
| 794 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 795 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 796 | |
| 797 origStudy = DoGet(_REMOTE, '/studies')[0] | |
| 798 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy, | |
| 799 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 800 'application/json')['ID'] | |
| 801 | |
| 802 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['ModifiedFrom']) | |
| 803 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series'] | |
| 804 self.assertEqual(2, len(series)) | |
| 805 for s in series: | |
| 806 ss = DoGet(_REMOTE, '/series/%s' % s)['ModifiedFrom'] | |
| 807 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy']) | |
| 808 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy']) | |
| 809 | |
| 810 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances'] | |
| 811 for i in instances: | |
| 812 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom'] | |
| 813 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 814 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 815 | |
| 816 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 817 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 818 | |
| 819 | |
| 820 def test_anonymize_series(self): | |
| 821 # Upload 4 images from the same series | |
| 822 for i in range(4): | |
| 823 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 824 | |
| 825 origSeries = DoGet(_REMOTE, '/series')[0] | |
| 826 newSeries = DoPost(_REMOTE, '/series/%s/anonymize' % origSeries, | |
| 827 '{}', | |
| 828 'application/json')['ID'] | |
| 829 | |
| 830 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['AnonymizedFrom']) | |
| 831 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances'] | |
| 832 self.assertEqual(4, len(instances)) | |
| 833 for i in instances: | |
| 834 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom'] | |
| 835 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 836 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 837 | |
| 838 DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j) | |
| 839 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i)) | |
| 840 | |
| 841 | |
| 842 def test_anonymize_study(self): | |
| 843 # Upload 4 images from the 2 series of the same study | |
| 844 for i in range(4): | |
| 845 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 846 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 847 | |
| 848 origStudy = DoGet(_REMOTE, '/studies')[0] | |
| 849 newStudy = DoPost(_REMOTE,'/studies/%s/anonymize' % origStudy, | |
| 850 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 851 'application/json')['ID'] | |
| 852 | |
| 853 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['AnonymizedFrom']) | |
| 854 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series'] | |
| 855 self.assertEqual(2, len(series)) | |
| 856 for s in series: | |
| 857 ss = DoGet(_REMOTE, '/series/%s' % s)['AnonymizedFrom'] | |
| 858 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy']) | |
| 859 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy']) | |
| 860 | |
| 861 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances'] | |
| 862 for i in instances: | |
| 863 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom'] | |
| 864 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 865 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 866 | |
| 867 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 868 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 11 | 869 |
| 870 | |
| 871 | |
| 872 def test_storescu(self): | |
| 873 # Check emptiness | |
| 874 e = DoGet(_REMOTE, '/exports') | |
| 875 self.assertEqual(0, len(e['Exports'])) | |
| 876 self.assertEqual(0, e['Last']) | |
| 877 self.assertTrue(e['Done']) | |
| 878 e = DoGet(_REMOTE, '/exports?last') | |
| 879 self.assertEqual(0, len(e['Exports'])) | |
| 880 self.assertEqual(0, e['Last']) | |
| 881 self.assertTrue(e['Done']) | |
| 882 | |
| 883 # Add 1 instance | |
| 884 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 885 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 886 | |
| 887 # Export the instance | |
| 888 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') # instance | |
| 889 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 890 self.assertEqual(1, len(DoGet(_LOCAL, '/studies'))) | |
| 891 self.assertEqual(1, len(DoGet(_LOCAL, '/series'))) | |
| 892 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 893 | |
| 894 e = DoGet(_REMOTE, '/exports') | |
| 895 self.assertEqual(1, len(e['Exports'])) | |
| 896 self.assertTrue(e['Done']) | |
| 897 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 898 e = DoGet(_REMOTE, '/exports?limit=1') | |
| 899 self.assertEqual(1, len(e['Exports'])) | |
| 900 self.assertTrue(e['Done']) | |
| 901 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 902 e = DoGet(_REMOTE, '/exports?last') | |
| 903 self.assertEqual(1, len(e['Exports'])) | |
| 904 self.assertTrue(e['Done']) | |
| 905 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 906 seqInstance = e['Last'] | |
| 907 | |
| 908 # Export the series | |
| 909 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', 'text/plain') | |
| 910 | |
| 911 e = DoGet(_REMOTE, '/exports') | |
| 912 self.assertEqual(2, len(e['Exports'])) | |
| 913 self.assertTrue(e['Done']) | |
| 914 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 915 seqSeries = e['Last'] | |
| 916 self.assertNotEqual(seqInstance, seqSeries) | |
| 917 e = DoGet(_REMOTE, '/exports?limit=1&since=0') | |
| 918 self.assertEqual(1, len(e['Exports'])) | |
| 919 self.assertFalse(e['Done']) | |
| 920 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance) | |
| 921 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance)) | |
| 922 self.assertEqual(1, len(e['Exports'])) | |
| 923 self.assertTrue(e['Done']) | |
| 924 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 925 e = DoGet(_REMOTE, '/exports?last') | |
| 926 self.assertEqual(1, len(e['Exports'])) | |
| 927 self.assertTrue(e['Done']) | |
| 928 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 929 | |
| 930 # Export the study | |
| 931 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', 'text/plain') | |
| 932 seqStudy = DoGet(_REMOTE, '/exports')['Last'] | |
| 933 | |
| 934 # Export the patient | |
| 935 j = DoPost(_REMOTE, '/modalities/orthanctest/store', '6816cb19-844d5aee-85245eba-28e841e6-2414fae2', 'text/plain') | |
| 936 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 937 self.assertEqual(1, len(DoGet(_LOCAL, '/studies'))) | |
| 938 self.assertEqual(1, len(DoGet(_LOCAL, '/series'))) | |
| 939 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 940 | |
| 941 e = DoGet(_REMOTE, '/exports') | |
| 942 self.assertEqual(4, len(e['Exports'])) | |
| 943 self.assertTrue(e['Done']) | |
| 944 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 945 seqPatient = e['Last'] | |
| 946 self.assertNotEqual(seqInstance, seqSeries) | |
| 947 self.assertNotEqual(seqSeries, seqStudy) | |
| 948 self.assertNotEqual(seqStudy, seqPatient) | |
| 949 self.assertTrue(seqInstance < seqSeries) | |
| 950 self.assertTrue(seqSeries < seqStudy) | |
| 951 self.assertTrue(seqStudy < seqPatient) | |
| 952 e = DoGet(_REMOTE, '/exports?limit=1&since=0') | |
| 953 self.assertEqual(1, len(e['Exports'])) | |
| 954 self.assertFalse(e['Done']) | |
| 955 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance) | |
| 956 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance)) | |
| 957 self.assertEqual(1, len(e['Exports'])) | |
| 958 self.assertFalse(e['Done']) | |
| 959 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 960 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqSeries)) | |
| 961 self.assertEqual(1, len(e['Exports'])) | |
| 962 self.assertFalse(e['Done']) | |
| 963 self.assertEqual(e['Exports'][-1]['Seq'], seqStudy) | |
| 964 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqStudy)) | |
| 965 self.assertEqual(1, len(e['Exports'])) | |
| 966 self.assertTrue(e['Done']) | |
| 967 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient) | |
| 968 e = DoGet(_REMOTE, '/exports?last') | |
| 969 self.assertEqual(1, len(e['Exports'])) | |
| 970 self.assertTrue(e['Done']) | |
| 971 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient) | |
| 972 | |
| 973 | |
| 974 # Check the content of the logged information | |
| 975 e = DoGet(_REMOTE, '/exports')['Exports'] | |
| 976 | |
| 977 if 'PatientID' in e[0]: | |
| 978 # Since Orthanc 0.8.6 | |
| 979 patient = 'PatientID' | |
| 980 study = 'StudyInstanceUID' | |
| 981 series = 'SeriesInstanceUID' | |
| 982 instance = 'SOPInstanceUID' | |
| 983 else: | |
| 984 # Up to Orthanc 0.8.5 | |
| 985 patient = 'PatientId' | |
| 986 study = 'StudyInstanceUid' | |
| 987 series = 'SeriesInstanceUid' | |
| 988 instance = 'SopInstanceUid' | |
| 989 | |
| 990 for k in range(4): | |
| 991 self.assertTrue('Date' in e[k]) | |
| 992 self.assertTrue('Seq' in e[k]) | |
| 993 self.assertEqual('orthanctest', e[k]['RemoteModality']) | |
| 994 | |
| 995 self.assertEqual(10, len(e[0])) | |
| 996 self.assertEqual('Instance', e[0]['ResourceType']) | |
| 997 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['ID']) | |
| 998 self.assertEqual('/instances/66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['Path']) | |
| 999 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', e[0][instance]) | |
| 1000 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', e[0][series]) | |
| 1001 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[0][study]) | |
| 1002 self.assertEqual('ozp00SjY2xG', e[0][patient]) | |
| 1003 | |
| 1004 self.assertEqual(9, len(e[1])) | |
| 1005 self.assertEqual('Series', e[1]['ResourceType']) | |
| 1006 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['ID']) | |
| 1007 self.assertEqual('/series/f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['Path']) | |
| 1008 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', e[1][series]) | |
| 1009 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[1][study]) | |
| 1010 self.assertEqual('ozp00SjY2xG', e[1][patient]) | |
| 1011 | |
| 1012 self.assertEqual(8, len(e[2])) | |
| 1013 self.assertEqual('Study', e[2]['ResourceType']) | |
| 1014 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['ID']) | |
| 1015 self.assertEqual('/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['Path']) | |
| 1016 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[2][study]) | |
| 1017 self.assertEqual('ozp00SjY2xG', e[2][patient]) | |
| 1018 | |
| 1019 self.assertEqual(7, len(e[3])) | |
| 1020 self.assertEqual('Patient', e[3]['ResourceType']) | |
| 1021 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['ID']) | |
| 1022 self.assertEqual('/patients/6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['Path']) | |
| 1023 self.assertEqual('ozp00SjY2xG', e[3][patient]) | |
| 1024 | |
| 1025 DropOrthanc(_REMOTE) | |
| 1026 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 1027 | |
| 1028 | |
| 1029 def test_store_peer(self): | |
| 1030 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports'])) | |
| 1031 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 1032 | |
| 1033 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1034 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 1035 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1036 | |
| 1037 j = DoPost(_REMOTE, '/peers/peer/store', str(i), 'text/plain') | |
| 1038 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 1039 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1040 | |
| 1041 self.assertEqual(1, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 1042 | |
| 1043 DropOrthanc(_REMOTE) | |
| 1044 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 1045 | |
| 1046 | |
| 1047 def test_bulk_storescu(self): | |
| 1048 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 1049 | |
| 1050 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1051 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 1052 | |
| 1053 j = DoPost(_REMOTE, '/modalities/orthanctest/store', [ a['ID'], b['ID'] ], 'application/json') | |
| 1054 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) | |
| 1055 | |
| 1056 DropOrthanc(_LOCAL) | |
| 1057 | |
| 1058 # Send using patient's UUID | |
| 1059 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 1060 j = DoPost(_REMOTE, '/modalities/orthanctest/store', | |
| 1061 [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ], 'application/json') | |
| 1062 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) | |
| 1063 | |
| 1064 | |
| 1065 def test_color(self): | |
| 1066 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID'] | |
| 1067 im = GetImage(_REMOTE, '/instances/%s/preview' % i) | |
| 1068 self.assertEqual("RGB", im.mode) | |
| 1069 self.assertEqual(41, im.size[0]) | |
| 1070 self.assertEqual(41, im.size[1]) | |
| 1071 | |
| 1072 # http://effbot.org/zone/pil-comparing-images.htm | |
| 13 | 1073 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png')) |
| 11 | 1074 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None) |
| 1075 | |
| 1076 | |
| 12 | 1077 def test_faking_ruby_put(self): |
| 1078 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1079 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 1080 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 1081 a = DoGet(_REMOTE, '/patients')[0] | |
| 1082 b = DoGet(_REMOTE, '/patients')[1] | |
| 1083 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1084 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0') | |
| 1085 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1086 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '1') | |
| 1087 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1088 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0') | |
| 1089 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1090 | |
| 1091 | |
| 1092 def test_faking_ruby_delete(self): | |
| 1093 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1094 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 1095 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 1096 a = DoGet(_REMOTE, '/patients')[0] | |
| 1097 b = DoGet(_REMOTE, '/patients')[1] | |
| 1098 DoGet(_REMOTE, '/patients/%s' % a, data = { '_method' : 'DELETE' }) | |
| 1099 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1100 DoGet(_REMOTE, '/patients/%s' % b, data = { '_method' : 'DELETE' }) | |
| 1101 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 1102 | |
| 1103 | |
| 1104 def test_faking_google_put(self): | |
| 1105 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1106 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 1107 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 1108 a = DoGet(_REMOTE, '/patients')[0] | |
| 1109 b = DoGet(_REMOTE, '/patients')[1] | |
| 1110 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1111 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '0') | |
| 1112 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1113 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '1') | |
| 1114 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1115 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '0') | |
| 1116 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1117 | |
| 1118 | |
| 1119 def test_faking_google_delete(self): | |
| 1120 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1121 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 1122 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 1123 a = DoGet(_REMOTE, '/patients')[0] | |
| 1124 b = DoGet(_REMOTE, '/patients')[1] | |
| 1125 DoPost(_REMOTE, '/patients/%s' % a, headers = { 'X-HTTP-Method-Override' : 'DELETE' }) | |
| 1126 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1127 DoPost(_REMOTE, '/patients/%s' % b, headers = { 'X-HTTP-Method-Override' : 'DELETE' }) | |
| 1128 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 1129 | |
| 1130 | |
| 1131 def test_lua(self): | |
| 1132 self.assertEqual(42, DoPost(_REMOTE, '/tools/execute-script', 'print(42)')) | |
| 1133 self.assertTrue(IsDefinedInLua(_REMOTE, 'PrintRecursive')) | |
| 1134 self.assertFalse(IsDefinedInLua(_REMOTE, 'HelloWorld')) | |
| 1135 | |
| 1136 | |
| 1137 def test_metadata(self): | |
| 1138 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1139 p = DoGet(_REMOTE, '/patients')[0] | |
| 1140 i = DoGet(_REMOTE, '/instances')[0] | |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1141 series = DoGet(_REMOTE, '/series')[0] |
| 12 | 1142 |
| 1143 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) | |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1144 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1145 self.assertEqual(2, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1146 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1147 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1148 self.assertEqual(1, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1149 self.assertTrue('LastUpdate' in m) |
| 12 | 1150 |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1151 # 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
|
1152 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
|
1153 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
|
1154 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
|
1155 |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1156 m = DoGet(_REMOTE, '/studies/%s/metadata' % DoGet(_REMOTE, '/studies')[0]) |
|
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(2, 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(1, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1162 self.assertTrue('LastUpdate' in m) |
|
369
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 m = DoGet(_REMOTE, '/series/%s/metadata' % series) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1165 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1166 self.assertEqual(3, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1167 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1168 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1169 self.assertEqual(2, len(m)) |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1170 self.assertTrue('LastUpdate' in m) |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1171 |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1172 # New in Orthanc 1.9.0 |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1173 self.assertTrue('RemoteAET' in m) |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1174 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
|
1175 |
| 12 | 1176 m = DoGet(_REMOTE, '/instances/%s/metadata' % i) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1177 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1178 self.assertEqual(10, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1179 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1180 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1181 self.assertEqual(9, len(m)) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1182 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
|
1183 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
|
1184 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1185 self.assertEqual(8, len(m)) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1186 |
| 12 | 1187 self.assertTrue('IndexInSeries' in m) |
| 1188 self.assertTrue('ReceptionDate' in m) | |
| 1189 self.assertTrue('RemoteAET' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1190 self.assertTrue('Origin' in m) |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
1191 self.assertTrue('TransferSyntax' in m) |
|
95
a807a4699eb4
testing of metadata SopClassUid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
1192 self.assertTrue('SopClassUid' in m) |
| 145 | 1193 self.assertTrue('RemoteIP' in m) |
| 1194 self.assertTrue('HttpUsername' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1195 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
|
1196 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
|
1197 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
|
1198 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
|
1199 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i), '1.2.840.10008.5.1.4.1.1.4') |
| 12 | 1200 |
| 1201 # Play with custom metadata | |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1202 (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
|
1203 self.assertEqual('200', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1204 self.assertEqual('', body) |
|
394
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1205 |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1206 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
|
1207 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
|
1208 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1209 self.assertFalse('ETag' in headers) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1210 self.assertFalse('etag' in headers) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1211 |
| 12 | 1212 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1213 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1214 self.assertEqual(3, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1215 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1216 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1217 self.assertEqual(2, len(m)) |
| 12 | 1218 self.assertTrue('LastUpdate' in m) |
| 1219 self.assertTrue('5555' in m) | |
| 1220 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
|
1221 |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1222 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2): |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1223 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
|
1224 'If-Match' : headers['etag'] |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1225 }) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1226 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1227 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'hello') |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1228 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1229 (headers, body) = DoGetRaw(_REMOTE, '/patients/%s/metadata/5555' % p) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1230 self.assertEqual('200', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1231 self.assertEqual('hello', body) |
|
394
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1232 |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1233 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2): |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1234 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p, headers = { |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1235 'If-Match' : headers['etag'] |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1236 }) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1237 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1238 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1239 |
| 12 | 1240 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1241 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1242 self.assertEqual(2, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1243 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1244 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1245 self.assertEqual(1, len(m)) |
| 12 | 1246 self.assertTrue('LastUpdate' in m) |
| 13 | 1247 |
| 1248 | |
| 1249 def test_statistics(self): | |
| 1250 # Upload 16 instances | |
| 1251 for i in range(4): | |
| 1252 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 1253 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 1254 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 1255 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 1256 | |
| 1257 s = DoGet(_REMOTE, '/statistics') | |
| 1258 self.assertEqual(16, s['CountInstances']) | |
| 1259 self.assertEqual(2, s['CountPatients']) | |
| 1260 self.assertEqual(2, s['CountStudies']) | |
| 1261 self.assertEqual(4, s['CountSeries']) | |
| 1262 d = int(s['TotalUncompressedSize']) | |
| 1263 | |
| 1264 e = 0 | |
| 1265 for patient in DoGet(_REMOTE, '/patients'): | |
| 1266 s = DoGet(_REMOTE, '/patients/%s/statistics' % patient) | |
| 1267 self.assertEqual(8, s['CountInstances']) | |
| 1268 self.assertEqual(1, s['CountStudies']) | |
| 1269 self.assertEqual(2, s['CountSeries']) | |
| 1270 e += int(s['UncompressedSize']) | |
| 1271 | |
| 1272 for study in DoGet(_REMOTE, '/studies'): | |
| 1273 s = DoGet(_REMOTE, '/studies/%s/statistics' % study) | |
| 1274 self.assertEqual(8, s['CountInstances']) | |
| 1275 self.assertEqual(2, s['CountSeries']) | |
| 1276 e += int(s['UncompressedSize']) | |
| 1277 | |
| 1278 for series in DoGet(_REMOTE, '/series'): | |
| 1279 s = DoGet(_REMOTE, '/series/%s/statistics' % series) | |
| 1280 self.assertEqual(4, s['CountInstances']) | |
| 1281 e += int(s['UncompressedSize']) | |
| 1282 | |
| 1283 self.assertEqual(3 * d, e) | |
| 1284 | |
| 1285 | |
| 1286 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
|
1287 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
|
1288 |
| 13 | 1289 patient = DoGet(_REMOTE, '/patients')[0] |
| 1290 instance = DoGet(_REMOTE, '/instances')[0] | |
| 1291 size = int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']) | |
| 1292 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1293 | |
| 1294 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) | |
| 1295 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
|
1296 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1297 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
|
1298 if IsDicomUntilPixelDataStored(_REMOTE): |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1299 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
|
1300 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
|
1301 |
|
448
63f475995400
Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
447
diff
changeset
|
1302 # New in Orthanc 1.10.0 |
|
443
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1303 a = DoGet(_REMOTE, '/instances/%s/attachments?full' % instance) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1304 self.assertEqual(2, len(a)) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1305 self.assertEqual(1, a['dicom']) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1306 self.assertEqual(3, a['dicom-until-pixel-data']) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1307 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1308 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1309 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
|
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 a = DoGet(_REMOTE, '/instances/%s/attachments?full' % instance) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1313 self.assertEqual(1, len(a)) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1314 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
|
1315 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1316 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
|
1317 self.assertTrue('dicom-as-json' in DoGet(_REMOTE, '/instances/%s/attachments' % instance)) |
| 13 | 1318 |
|
448
63f475995400
Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
447
diff
changeset
|
1319 # New in Orthanc 1.10.0 |
|
443
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1320 self.assertRaises(Exception, lambda: DoGet( |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1321 _REMOTE, '/instances/%s/attachments?full' % instance)) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1322 |
| 13 | 1323 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/patients/%s/attachments/22' % patient, 'hello')) |
| 1324 hello = 'hellohellohellohellohellohellohellohellohello' | |
| 1325 DoPut(_REMOTE, '/patients/%s/attachments/1025' % patient, hello) | |
| 1326 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1327 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1328 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1329 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient))) | |
| 1330 | |
| 1331 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world') | |
| 1332 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1333 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1334 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1335 size + | |
| 1336 int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient)) + | |
| 1337 int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient))) | |
| 1338 | |
| 1339 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) | |
| 1340 self.assertEqual(hello, DoGet(_REMOTE, '/patients/%s/attachments/1025/data' % patient)) | |
| 1341 self.assertEqual('world', DoGet(_REMOTE, '/patients/%s/attachments/1026/data' % patient)) | |
| 1342 DoPost(_REMOTE, '/patients/%s/attachments/1025/verify-md5' % patient) | |
| 1343 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
|
1344 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
|
1345 'If-Match' : '0-%s' % ComputeMD5('world'), |
|
392
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
1346 }) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
1347 |
|
394
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1348 (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
|
1349 self.assertEqual('200', headers['status']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
1350 self.assertEqual('world2', body) |
| 13 | 1351 |
| 1352 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
|
1353 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
|
1354 'If-Match' : '0-%s' % ComputeMD5(hello), |
|
392
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
1355 }) |
| 13 | 1356 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), |
| 1357 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1358 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1359 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient))) | |
| 1360 | |
| 1361 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
|
1362 |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1363 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2): |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1364 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient, headers = { |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1365 'If-Match' : headers['etag'] |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1366 }) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1367 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1368 self.assertFalse('etag' in headers) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1369 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1370 |
| 13 | 1371 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) |
| 1372 | |
| 1373 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), size) | |
| 1374 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1375 | |
| 1376 | |
| 1377 def test_incoming_storescu(self): | |
| 1378 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 45 | 1379 subprocess.check_call([ FindExecutable('storescu'), |
|
44
ffa542cce638
Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
1380 _REMOTE['Server'], str(_REMOTE['DicomPort']), |
| 13 | 1381 GetDatabasePath('ColorTestImageJ.dcm') ]) |
| 1382 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1383 | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1384 i = DoGet(_REMOTE, '/instances') |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1385 self.assertEqual(1, len(i)) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1386 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
|
1387 |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1388 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1389 self.assertEqual(10, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1390 self.assertTrue('MainDicomTagsSignature' in m) # New in Orthanc 1.11.0 |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1391 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1392 self.assertEqual(9, len(m)) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1393 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
|
1394 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1395 self.assertEqual(8, len(m)) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1396 |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1397 self.assertTrue('IndexInSeries' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1398 self.assertTrue('ReceptionDate' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1399 self.assertTrue('RemoteAET' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1400 self.assertTrue('Origin' in m) |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
1401 self.assertTrue('TransferSyntax' in m) |
|
95
a807a4699eb4
testing of metadata SopClassUid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
1402 self.assertTrue('SopClassUid' in m) |
| 145 | 1403 self.assertTrue('RemoteIP' in m) |
| 1404 self.assertTrue('CalledAET' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1405 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
|
1406 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
|
1407 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
|
1408 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
|
1409 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
|
1410 |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1411 series = DoGet(_REMOTE, '/series')[0] |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1412 m = DoGet(_REMOTE, '/series/%s/metadata' % series) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1413 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1414 self.assertEqual(3, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1415 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1416 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1417 self.assertEqual(2, len(m)) |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1418 self.assertTrue('LastUpdate' in m) |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1419 self.assertTrue('RemoteAET' in m) |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1420 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
|
1421 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
|
1422 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
|
1423 |
| 13 | 1424 |
| 1425 def test_incoming_findscu(self): | |
| 1426 UploadInstance(_REMOTE, 'Multiframe.dcm') | |
| 1427 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') | |
| 1428 | |
| 1429 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', '0010,0010' ]) | |
| 1430 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) | |
| 1431 self.assertEqual(2, len(patientNames)) | |
| 1432 self.assertTrue('Test Patient BG ' in patientNames) | |
| 1433 self.assertTrue('Anonymized' in patientNames) | |
| 1434 | |
| 1435 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,0021' ]) | |
| 1436 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i) | |
| 1437 self.assertEqual(2, len(series)) | |
| 1438 self.assertTrue('20070208' in series) | |
| 1439 self.assertTrue('19980312' in series) | |
| 1440 | |
|
335
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
1441 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
|
1442 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1443 self.assertEqual(1, len(series)) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1444 self.assertTrue('19980312' in series) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1445 |
| 13 | 1446 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=Anonymized' ]) |
| 1447 series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i) | |
| 1448 self.assertEqual(1, len(series)) | |
| 1449 | |
| 1450 # Test the "CaseSentitivePN" flag (false by default) | |
| 1451 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=anonymized' ]) | |
| 1452 series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i) | |
| 1453 self.assertEqual(1, len(series)) | |
|
66
821d9eb73c45
Test returning sequence values
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
1454 |
| 70 | 1455 # Test range search (buggy if Orthanc <= 0.9.6) |
| 1456 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-' ]) | |
| 1457 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1458 self.assertEqual(2, len(studies)) | |
| 1459 self.assertTrue('20070208' in studies) | |
| 1460 self.assertTrue('19980312' in studies) | |
| 1461 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-19980312' ]) | |
| 1462 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1463 self.assertEqual(1, len(studies)) | |
| 1464 self.assertTrue('19980312' in studies) | |
| 1465 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=-19980312' ]) | |
| 1466 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1467 self.assertEqual(1, len(studies)) | |
| 1468 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
|
1469 |
|
05f48c19c60d
Test "Retrieve AE Title" is returned by C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
324
diff
changeset
|
1470 # 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
|
1471 # 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
|
1472 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
|
1473 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
|
1474 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
|
1475 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
|
1476 self.assertEqual('ORTHANC', instances[1].strip()) |
| 13 | 1477 |
| 1478 | |
|
191
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1479 def test_incoming_findscu_2(self): |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1480 # This test fails if "LookupMode_DatabaseOnly" is used |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1481 # (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
|
1482 # DICOM tags are returned) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1483 UploadInstance(_REMOTE, 'Multiframe.dcm') |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1484 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1485 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1486 # 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
|
1487 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
|
1488 sequences = re.findall('\(0008,2112\)', i) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1489 self.assertEqual(1, len(sequences)) |
|
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 # Test returning a non-main DICOM tag, |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1492 # "SecondaryCaptureDeviceID" (0018,1010), whose value is |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1493 # "MEDPC" in "ColorTestImageJ.dcm" |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1494 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0018,1010' ]) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1495 tags = re.findall('\(0018,1010\).*MEDPC', i) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1496 self.assertEqual(1, len(tags)) |
|
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 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1499 def test_incoming_findscu_3(self): |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1500 # This test fails if "LookupMode_DatabaseOnly" or |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1501 # "LookupMode_DiskOnAnswer" is used, as |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1502 # "SecondaryCaptureDeviceID" (0018,1010) is not a main DICOM |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1503 # 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
|
1504 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1505 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1506 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
|
1507 sequences = re.findall('\(0018,1010\)', i) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1508 self.assertEqual(1, len(sequences)) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1509 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1510 |
| 13 | 1511 def test_incoming_movescu(self): |
| 1512 UploadInstance(_REMOTE, 'Multiframe.dcm') | |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1513 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1514 # No matching patient, so no job is created |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1515 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1516 CallMoveScu([ '--patient', '-k', '0008,0052=PATIENT', '-k', 'PatientID=none' ]) |
| 13 | 1517 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1518 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1519 # 1 Matching patient, track the job |
| 138 | 1520 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
| 1521 '--patient', | |
| 1522 '-k', '0008,0052=PATIENT', | |
| 1523 '-k', 'PatientID=12345678' | |
| 1524 ]))) | |
| 13 | 1525 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) |
| 1526 | |
| 1527 | |
| 1528 def test_findscu(self): | |
| 1529 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1530 j = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] | |
| 1531 k = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] | |
| 1532 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 1533 | |
| 1534 # Test the "find-patient" level | |
| 1535 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }) | |
| 1536 self.assertEqual(1, len(p)) | |
| 1537 self.assertEqual('ozp00SjY2xG', p[0]['PatientID']) | |
| 1538 | |
| 1539 # Test wildcards constraints. The "LO" value representation | |
| 1540 # for PatientID is always case-sensitive, but the "PN" for | |
| 1541 # PatientName might depend on the implementation: | |
| 1542 # "GenerateConfigurationForTests.py" will force it to be case | |
| 1543 # insensitive (which was the default until Orthanc 0.8.6). | |
| 1544 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'K*' }) | |
| 1545 self.assertEqual(1, len(p)) | |
| 1546 | |
| 1547 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'k*' }) | |
| 1548 self.assertEqual(1, len(p)) | |
| 1549 | |
| 1550 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'ozp*' }) | |
| 1551 self.assertEqual(1, len(p)) | |
| 1552 | |
| 1553 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'o?p*' }) | |
| 1554 self.assertEqual(1, len(p)) | |
| 1555 | |
| 1556 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : '0?q*' }) | |
| 1557 self.assertEqual(0, len(p)) | |
| 1558 | |
| 1559 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'B*' }) | |
| 1560 self.assertEqual(0, len(p)) | |
| 1561 | |
| 1562 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'b*' }) | |
| 1563 self.assertEqual(0, len(p)) | |
| 1564 | |
| 1565 DoPost(_REMOTE, '/modalities/orthanctest/store', str(j), 'text/plain') | |
| 1566 DoPost(_REMOTE, '/modalities/orthanctest/store', str(k), 'text/plain') | |
| 1567 DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }) | |
| 1568 self.assertEqual(3, len(DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }))) | |
| 1569 | |
| 1570 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'A*' }) | |
| 1571 self.assertEqual(2, len(p)) | |
| 1572 | |
| 1573 # Test the "find-study" level. This is the instance "ColorTestImageJ.dcm" | |
| 1574 s = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ' }) | |
| 1575 self.assertEqual(1, len(s)) | |
| 1576 self.assertEqual('20070208', s[0]['StudyDate']) | |
| 1577 | |
| 1578 # Test range searches | |
| 1579 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1580 'StudyDate' : '-20070101' }) | |
| 1581 self.assertEqual(0, len(t)) | |
| 1582 | |
| 1583 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1584 'StudyDate' : '20090101-' }) | |
| 1585 self.assertEqual(0, len(t)) | |
| 1586 | |
| 1587 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1588 'StudyDate' : '20070101-' }) | |
| 1589 self.assertEqual(1, len(t)) | |
| 1590 | |
| 1591 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1592 'StudyDate' : '-20090101' }) | |
| 1593 self.assertEqual(1, len(t)) | |
| 1594 | |
| 1595 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1596 'StudyDate' : '20070207-20070207' }) | |
| 1597 self.assertEqual(0, len(t)) | |
| 1598 | |
| 1599 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1600 'StudyDate' : '20070208-20070208' }) | |
| 1601 self.assertEqual(1, len(t)) | |
| 1602 | |
| 1603 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1604 'StudyDate' : '20070209-20070209' }) | |
| 1605 self.assertEqual(0, len(t)) | |
| 1606 | |
| 1607 # Test the ModalitiesInStudy tag | |
| 1608 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1609 'PatientID' : 'B9uTHKOZ', | |
| 1610 'ModalitiesInStudy' : 'US' }) | |
| 1611 self.assertEqual(0, len(t)) | |
| 1612 | |
| 1613 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1614 'PatientID' : 'B9uTHKOZ', | |
| 1615 'ModalitiesInStudy' : 'CT' }) | |
| 1616 self.assertEqual(1, len(t)) | |
| 1617 | |
| 1618 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1619 'PatientID' : 'B9uTHKOZ', | |
| 1620 'ModalitiesInStudy' : 'US\\CT' }) | |
| 1621 self.assertEqual(1, len(t)) | |
| 1622 | |
|
466
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1623 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { |
|
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1624 'PatientID' : 'B9uTHKOZ', |
|
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1625 'ModalitiesInStudy' : '' }) |
|
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1626 self.assertEqual(1, len(t)) |
|
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1627 |
| 13 | 1628 # Test the "find-series" level |
| 1629 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1630 'PatientID' : 'B9uTHKOZ', | |
| 1631 'StudyInstanceUID' : s[0]['StudyInstanceUID'] }) | |
| 1632 self.assertEqual(1, len(t)) | |
| 1633 | |
| 1634 # Test "\" separator | |
| 1635 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1636 'PatientID' : 'B9uTHKOZ', | |
| 1637 'StudyInstanceUID' : s[0]['StudyInstanceUID'], | |
| 1638 'Modality' : 'MR\\CT\\US' }) | |
| 1639 self.assertEqual(1, len(t)) | |
| 1640 | |
| 1641 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1642 'PatientID' : 'B9uTHKOZ', | |
| 1643 'StudyInstanceUID' : s[0]['StudyInstanceUID'], | |
| 1644 'Modality' : 'MR\\US' }) | |
| 1645 self.assertEqual(0, len(t)) | |
| 1646 | |
| 1647 | |
| 1648 def test_update_modalities(self): | |
| 1649 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
|
1650 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/modalities/toto')) |
| 13 | 1651 DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000 ]) |
| 116 | 1652 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'MedInria' ]) # check backward compatiblity with obsolete manufacturer |
| 1653 DoDelete(_REMOTE, '/modalities/tata') | |
| 124 | 1654 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoUniversalWildcard' ]) |
|
121
1a19f953f53c
also test GenericNoWildcardInDates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
120
diff
changeset
|
1655 DoDelete(_REMOTE, '/modalities/tata') |
|
1a19f953f53c
also test GenericNoWildcardInDates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
120
diff
changeset
|
1656 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoWildcardInDates' ]) |
| 128 | 1657 modalitiesReadback = DoGet(_REMOTE, '/modalities?expand') |
|
182
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1658 self.assertEqual('STORESCP', modalitiesReadback['tata']['AET']) |
|
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1659 self.assertEqual('localhost', modalitiesReadback['tata']['Host']) |
|
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1660 self.assertEqual(2000, modalitiesReadback['tata']['Port']) |
|
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1661 self.assertEqual('GenericNoWildcardInDates', modalitiesReadback['tata']['Manufacturer']) |
| 116 | 1662 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000, 'InvalidManufacturerName' ])) |
| 13 | 1663 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/toto')) |
| 1664 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
|
1665 |
|
429cc9d03610
test access to the configuration of one single peer or modality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
350
diff
changeset
|
1666 # 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
|
1667 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
|
1668 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
|
1669 |
| 13 | 1670 DoDelete(_REMOTE, '/modalities/toto') |
| 1671 DoDelete(_REMOTE, '/modalities/tata') | |
| 1672 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto')) | |
| 1673 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/tata')) | |
| 1674 | |
| 1675 | |
| 1676 def test_update_peers(self): | |
| 1677 # curl -X PUT http://localhost:8042/peers/toto -d '["http://localhost:8042/"]' -v | |
| 1678 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
|
1679 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/peers/toto')) |
| 13 | 1680 DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/' ]) |
| 214 | 1681 DoPut(_REMOTE, '/peers/tata', { 'Url': 'http://localhost:8042/', |
| 1682 'Username': 'user', | |
| 1683 'Password' : 'pass', | |
| 1684 'RemoteSelf' : 'self' }) | |
| 128 | 1685 self.assertTrue('tata' in DoGet(_REMOTE, '/peers')) |
| 1686 peersReadback = DoGet(_REMOTE, '/peers?expand') | |
| 1687 self.assertEqual('http://localhost:8042/', peersReadback['tata']['Url']) | |
| 1688 self.assertEqual('user', peersReadback['tata']['Username']) | |
| 214 | 1689 |
| 1690 if IsOrthancVersionAbove(_REMOTE, 1, 5, 4): | |
| 1691 self.assertEqual(None, peersReadback['tata']['Password']) # make sure no sensitive data is included | |
| 1692 self.assertFalse(peersReadback['tata']['Pkcs11']) # make sure no sensitive data is included | |
| 1693 self.assertEqual('self', peersReadback['tata']['RemoteSelf']) | |
| 1694 else: | |
| 1695 self.assertFalse('Password' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1696 self.assertFalse('Pkcs11' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1697 self.assertFalse('RemoteSelf' in peersReadback['tata']) | |
| 1698 | |
| 128 | 1699 self.assertFalse('CertificateFile' in peersReadback['tata']) # make sure no sensitive data is included |
| 1700 self.assertFalse('CertificateKeyFile' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1701 self.assertFalse('CertificateKeyPassword' in peersReadback['tata']) # make sure no sensitive data is included | |
| 214 | 1702 |
| 13 | 1703 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a' ])) |
| 1704 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a', 'b', 'c' ])) | |
| 1705 self.assertTrue('store' in DoGet(_REMOTE, '/peers/toto')) | |
| 1706 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
|
1707 |
|
429cc9d03610
test access to the configuration of one single peer or modality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
350
diff
changeset
|
1708 # 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
|
1709 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
|
1710 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
|
1711 |
| 13 | 1712 DoDelete(_REMOTE, '/peers/toto') |
| 1713 DoDelete(_REMOTE, '/peers/tata') | |
| 1714 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto')) | |
| 1715 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/tata')) | |
| 1716 | |
| 1717 | |
| 1718 def test_mesterhazy_modification(self): | |
| 1719 # When I modify a series ( eg. curl | |
| 1720 # http://localhost:8042/series/uidhere/modify -X POST -d | |
| 1721 # '{"Replace":{"SeriesDate":"19990101"}}' ) the modified | |
| 1722 # series is added to a new Study, instead of the existing | |
| 1723 # Study. Fixed in Orthanc 0.7.5 | |
| 1724 | |
| 1725 u = UploadInstance(_REMOTE, 'DummyCT.dcm') | |
| 1726 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' | |
| 1727 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 1728 | |
| 1729 modified = DoPost(_REMOTE, '/series/%s/modify' % series, | |
| 1730 json.dumps({ "Replace" : { "SeriesDate" : "19990101" }})) | |
| 1731 | |
| 1732 self.assertEqual(study, DoGet(_REMOTE, '/series/%s' % modified['ID']) ['ParentStudy']) | |
| 1733 | |
| 1734 | |
| 1735 def test_create(self): | |
| 1736 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 1737 json.dumps({ | |
| 1738 'PatientName' : 'Jodogne', | |
| 1739 'Modality' : 'CT', | |
| 58 | 1740 'SOPClassUID' : '1.2.840.10008.5.1.4.1.1.1', |
| 13 | 1741 'PixelData' : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==' # red dot in RGBA |
| 1742 })) | |
| 1743 | |
| 1744 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 1745 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip()) | |
| 1746 | |
| 1747 png = GetImage(_REMOTE, '/instances/%s/preview' % i['ID']) | |
| 1748 self.assertEqual((5, 5), png.size) | |
| 1749 | |
| 38 | 1750 j = DoGet(_REMOTE, i['Path']) |
| 1751 self.assertEqual('Instance', j['Type']) | |
| 1752 self.assertEqual(j['ID'], i['ID']) | |
| 1753 | |
| 13 | 1754 |
| 1755 def test_pilates(self): | |
| 1756 # "SCU failed error when accessing orthanc with osirix" by | |
| 1757 # Pilates Agentur (Mar 10, 2014 at 9:33 PM) | |
| 1758 i = UploadInstance(_REMOTE, 'PilatesArgenturGEUltrasoundOsiriX.dcm')['ID'] | |
| 1759 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 1760 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 1761 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 1762 | |
| 1763 | |
| 1764 def test_shared_tags(self): | |
| 1765 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1766 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')['ID'] | |
| 1767 p = DoGet(_REMOTE, '/patients')[0] | |
| 1768 | |
| 1769 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1770 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
|
1771 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
|
1772 |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
1773 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
|
1774 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
|
1775 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
|
1776 |
| 13 | 1777 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) |
| 1778 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1779 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1780 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1781 self.assertFalse('0008,0018' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1782 self.assertFalse('SOPInstanceUID' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1783 | |
| 1784 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/tags' % a)) | |
| 1785 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/tags?simplify' % a)) | |
| 1786 | |
| 1787 | |
| 1788 def test_modules(self): | |
| 1789 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1790 p = DoGet(_REMOTE, '/patients')[0] | |
| 1791 s = DoGet(_REMOTE, '/studies')[0] | |
| 1792 t = DoGet(_REMOTE, '/series')[0] | |
| 1793 | |
| 1794 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/module' % p)) | |
| 1795 self.assertTrue('PatientName' in DoGet(_REMOTE, '/patients/%s/module?simplify' % p)) | |
| 1796 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/studies/%s/module-patient' % p)) | |
| 1797 self.assertTrue('PatientName' in DoGet(_REMOTE, '/studies/%s/module-patient?simplify' % p)) | |
| 1798 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/studies/%s/module' % s)) | |
| 1799 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/studies/%s/module?simplify' % s)) | |
| 1800 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/series/%s/module' % p)) | |
| 1801 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/series/%s/module?simplify' % p)) | |
| 1802 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/module' % a)) | |
| 1803 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/module?simplify' % a)) | |
| 1804 | |
| 1805 | |
| 1806 def test_auto_directory(self): | |
| 1807 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1808 self.assertTrue('now' in DoGet(_REMOTE, '/tools')) | |
| 1809 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
|
1810 self.assertTrue('invalidate-tags' in DoGet(_REMOTE, '/tools')) |
| 13 | 1811 self.assertTrue(len(DoGet(_REMOTE, '/tools/dicom-conformance')) > 1000) |
| 1812 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities')) | |
| 1813 self.assertTrue('echo' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1814 self.assertTrue('find' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1815 self.assertTrue('find-instance' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1816 self.assertTrue('find-patient' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1817 self.assertTrue('find-series' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1818 self.assertTrue('find-study' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1819 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1820 self.assertTrue('store' in DoGet(_REMOTE, '/peers/peer')) | |
| 1821 self.assertTrue('matlab' in DoGet(_REMOTE, '/instances/%s/frames/0' % a)) | |
| 79 | 1822 self.assertTrue('raw' in DoGet(_REMOTE, '/instances/%s/frames/0' % a)) |
| 13 | 1823 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/tools/nope')) |
| 28 | 1824 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope')) |
| 1825 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope/nope.html')) | |
| 1826 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope')[0].status) | |
| 1827 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope/nope.html')[0].status) | |
| 13 | 1828 |
| 1829 | |
| 1830 def test_echo(self): | |
| 1831 DoPost(_REMOTE, '/modalities/orthanctest/echo') | |
|
359
8b476a383999
test empty body in /modalities/.../echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
357
diff
changeset
|
1832 DoPost(_REMOTE, '/modalities/orthanctest/echo', '{}') |
|
8b476a383999
test empty body in /modalities/.../echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
357
diff
changeset
|
1833 |
|
8b476a383999
test empty body in /modalities/.../echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
357
diff
changeset
|
1834 # 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
|
1835 DoPost(_REMOTE, '/modalities/orthanctest/echo', '') |
|
352
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
1836 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/nope/echo')) |
|
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
1837 |
|
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
1838 # New in Orthanc 1.8.1 |
|
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
1839 DoPost(_REMOTE, '/tools/dicom-echo', [ |
| 355 | 1840 _REMOTE['DicomAet'], _REMOTE['Server'], _REMOTE['DicomPort'] ]) |
|
352
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
1841 DoPost(_REMOTE, '/tools/dicom-echo', DoGet(_REMOTE, '/modalities/orthanctest/configuration')) |
| 13 | 1842 |
| 353 | 1843 # Use the 'CheckFind' new option in Orthanc 1.8.1 |
| 1844 DoPost(_REMOTE, '/modalities/self/echo', { 'CheckFind' : True }) | |
| 1845 DoPost(_REMOTE, '/tools/dicom-echo', { | |
| 1846 'AET' : _REMOTE['DicomAet'], | |
| 1847 'Host' : _REMOTE['Server'], | |
| 1848 'Port' : _REMOTE['DicomPort'], | |
| 1849 'CheckFind' : True | |
| 1850 }) | |
| 1851 | |
| 13 | 1852 |
| 1853 def test_xml(self): | |
| 1854 json = DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/json' }) | |
| 1855 xml = minidom.parseString(DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/xml' })) | |
| 1856 items = xml.getElementsByTagName('root')[0].getElementsByTagName('item') | |
| 1857 self.assertEqual(len(items), len(json)) | |
| 1858 | |
| 1859 self.assertTrue('dicom-conformance' in json) | |
| 1860 | |
| 1861 ok = False | |
| 1862 for i in items: | |
| 1863 if i.childNodes[0].data == 'dicom-conformance': | |
| 1864 ok = True | |
| 1865 self.assertTrue(ok) | |
| 1866 | |
| 1867 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1868 def test_googlecode_issue_16(self): |
| 13 | 1869 i = UploadInstance(_REMOTE, 'Issue16.dcm')['ID'] |
| 1870 t = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)['FrameIncrementPointer'] | |
| 1871 self.assertEqual('0018,1063', t) | |
| 1872 | |
| 1873 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1874 def test_googlecode_issue_22(self): |
| 13 | 1875 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] |
| 1876 a = [ | |
| 1877 "f804691f62197040438f4627c6b994f1", # Frame 0 | |
| 1878 "c69eee9a51eea3e8611e82e578897254", | |
| 1879 "315666be83e2d0111c77bc0996d84901", | |
| 1880 "3e27aa959d911172c48a1436443c72b1", | |
| 1881 "958642c9e7e9d232d3869faff546058c", | |
| 1882 "5e7ea8e3e4230cae707d143481355c59", | |
| 1883 "eda37f83558d858a596175aed8b2ad47", | |
| 1884 "486713bd2895c4ecbe0e97715ac7f80a", | |
| 1885 "091ef729eb169e67da8a0faa9631f9a8", | |
| 1886 "5aa2b8c7ffe0a483efaa8e12417686ca", | |
| 1887 "e2f39e85896fe58876654b94cd0b5013", | |
| 1888 "6fd2129e4950abbe1be053bc814d5da8", | |
| 1889 "c3331a8ba7a757f3d423735ab7fa81f9", | |
| 1890 "746f808582156734dd6b6fdfd3a0b72c", | |
| 1891 "8075ea2b227a70c60ea6b7b75a6bb190", | |
| 1892 "806b8b3e300c615099c11a5ec23465aa", | |
| 1893 "7c836aa298ba6eef96434579af631a11", | |
| 1894 "a0357dc9f4f72d73a885c33d7c287446", | |
| 1895 "f25ba3be1cc7d7fad95706adc199ea7d", | |
| 1896 "8b114c526b8cbed6cad8a3248b7b480c", | |
| 1897 "44e6670f127e612a2b4aa60a0d207698", | |
| 1898 "b8945f90fe02facf2ace24ca1ecbe0a5", | |
| 1899 "95c796c2fa8f59018b15cf2987b1f79b", | |
| 1900 "ce0a51ab30224205b44920221dc27351", # Frame 23 | |
| 1901 ] | |
| 1902 | |
| 1903 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 1904 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/preview' % s)) | |
| 1905 | |
| 1906 for i in range(len(a)): | |
| 1907 self.assertEqual(a[i], ComputeMD5(DoGet(_REMOTE, '/instances/%s/frames/%d/preview' % (s, i)))) | |
| 1908 | |
| 1909 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1910 def test_googlecode_issue_19(self): |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
1911 # This is an image with "YBR_FULL" photometric interpretation, it is not supported by Orthanc |
| 13 | 1912 # gdcmconv -i /home/jodogne/DICOM/GdcmDatabase/US_DataSet/HDI5000_US/3EAF5E01 -w -o Issue19.dcm |
| 1913 | |
| 1914 a = UploadInstance(_REMOTE, 'Issue19.dcm')['ID'] | |
| 304 | 1915 if not HasGdcmPlugin(_REMOTE): |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
1916 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/941ad3c8-05d05b88-560459f9-0eae0e20-6cddd533/preview')) |
| 13 | 1917 |
| 1918 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1919 def test_googlecode_issue_37(self): |
| 13 | 1920 # Same test for issues 35 and 37. Fixed in Orthanc 0.9.1 |
| 1921 u = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID'] | |
| 1922 | |
| 1923 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 1924 'CaseSensitive' : True, | |
| 1925 'Query' : { 'StationName' : 'SMR4-MP3' }}) | |
| 1926 self.assertEqual(1, len(a)) | |
| 14 | 1927 |
| 1928 | |
| 1929 def test_rest_find(self): | |
| 1930 # Upload 8 instances | |
| 1931 for i in range(2): | |
| 1932 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 1933 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 1934 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 1935 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 1936 | |
| 1937 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 1938 'CaseSensitive' : False, | |
|
194
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1939 'Query' : { 'PatientName' : 'BRAINIX' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1940 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1941 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1942 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1943 'CaseSensitive' : False, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1944 'Query' : { 'PatientName' : 'BRAINIX\\KNEE\\NOPE' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1945 self.assertEqual(2, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1946 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1947 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1948 'CaseSensitive' : False, |
| 14 | 1949 'Query' : { 'PatientName' : '*n*' }}) |
| 1950 self.assertEqual(2, len(a)) | |
| 1951 | |
| 1952 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 1953 'CaseSensitive' : True, | |
| 1954 'Query' : { 'PatientName' : '*n*' }}) | |
| 1955 self.assertEqual(0, len(a)) | |
| 1956 | |
| 1957 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True, | |
| 1958 'Level' : 'Patient', | |
| 1959 'CaseSensitive' : False, | |
| 1960 'Query' : { 'PatientName' : '*ne*' }}) | |
| 1961 self.assertEqual(1, len(a)) | |
| 1962 self.assertEqual('20080822', a[0]['MainDicomTags']['PatientBirthDate']) | |
| 1963 | |
| 1964 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 1965 'CaseSensitive' : True, | |
| 1966 'Query' : { 'PatientName' : '*ne*' }}) | |
| 1967 self.assertEqual(0, len(a)) | |
| 1968 | |
| 1969 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 1970 'CaseSensitive' : True, | |
| 1971 'Query' : { 'PatientName' : '*NE*' }}) | |
| 1972 self.assertEqual(1, len(a)) | |
| 1973 | |
| 1974 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 1975 'CaseSensitive' : True, | |
| 1976 'Query' : { 'PatientName' : '*NE*' }}) | |
| 1977 self.assertEqual(2, len(a)) | |
| 1978 | |
| 1979 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', | |
| 1980 'CaseSensitive' : True, | |
| 1981 'Query' : { 'PatientName' : '*NE*' }}) | |
| 1982 self.assertEqual(4, len(a)) | |
| 1983 | |
| 1984 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', 'Query' : { }}) | |
| 1985 self.assertEqual(2, len(a)) | |
| 1986 | |
| 1987 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', 'Query' : { }}) | |
| 1988 self.assertEqual(2, len(a)) | |
| 1989 | |
| 1990 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', 'Query' : { }}) | |
| 1991 self.assertEqual(4, len(a)) | |
| 1992 | |
| 1993 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', 'Query' : { }}) | |
| 1994 self.assertEqual(8, len(a)) | |
| 1995 | |
|
194
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1996 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1997 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1998 'Query' : { 'StudyDate' : '20061201-20061201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1999 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2000 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2001 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2002 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2003 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2004 'Query' : { 'StudyDate' : '20061201-20091201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2005 self.assertEqual(2, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2006 for i in range(2): |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2007 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2008 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2009 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2010 'Query' : { 'StudyDate' : '20061202-20061202' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2011 self.assertEqual(0, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2012 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2013 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2014 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2015 'Query' : { 'StudyDate' : '-20061201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2016 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2017 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2018 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2019 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2020 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2021 'Query' : { 'StudyDate' : '-20051201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2022 self.assertEqual(0, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2023 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2024 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2025 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2026 'Query' : { 'StudyDate' : '20061201-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2027 self.assertEqual(2, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2028 for i in range(2): |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2029 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2030 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2031 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2032 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2033 'Query' : { 'StudyDate' : '20061202-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2034 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2035 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2036 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2037 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2038 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2039 'Query' : { 'StudyDate' : '20080819-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2040 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2041 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2042 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2043 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2044 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2045 'Query' : { 'StudyDate' : '20080820-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2046 self.assertEqual(0, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2047 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2048 |
| 14 | 2049 |
| 2050 def test_rest_query_retrieve(self): | |
| 2051 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 2052 | |
| 2053 # Upload 8 instances | |
| 2054 for i in range(2): | |
| 2055 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 2056 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 2057 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 2058 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 2059 | |
| 2060 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 2061 for p in DoGet(_REMOTE, '/patients'): | |
| 2062 DoPost(_REMOTE, '/modalities/orthanctest/store', p) | |
| 2063 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 2064 | |
| 2065 for q in DoGet(_REMOTE, '/queries'): | |
| 2066 DoDelete(_REMOTE, '/queries/%s' % q) | |
| 2067 | |
| 2068 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 2069 self.assertEqual(0, len(DoGet(_REMOTE, '/queries'))) | |
|
509
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2070 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2071 if not IsOrthancVersionAbove(_LOCAL, 1, 11, 2): # TODO: check why this works with 0.8.6 and not with more recent versions |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2072 a = DoPost(_REMOTE, '/modalities/orthanctest/query', { 'Level' : 'Series', |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2073 'Query' : { |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2074 'PatientName' : '*NE*', |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2075 'StudyDate' : '*', |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2076 }})['ID'] |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2077 self.assertEqual(1, len(DoGet(_REMOTE, '/queries'))) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2078 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2079 b = DoGet(_REMOTE, '/queries/%s' % a) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2080 self.assertTrue('answers' in b) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2081 self.assertTrue('level' in b) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2082 self.assertTrue('modality' in b) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2083 self.assertTrue('query' in b) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2084 self.assertTrue('retrieve' in b) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2085 self.assertEqual('Series', DoGet(_REMOTE, '/queries/%s/level' % a)) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2086 self.assertEqual('orthanctest', DoGet(_REMOTE, '/queries/%s/modality' % a)) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2087 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2088 q = DoGet(_REMOTE, '/queries/%s/query?simplify' % a) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2089 self.assertEqual(2, len(q)) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2090 self.assertTrue('PatientName' in q) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2091 self.assertTrue('StudyDate' in q) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2092 self.assertEqual('*NE*', q['PatientName']) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2093 self.assertEqual('*', q['StudyDate']) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2094 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2095 self.assertEqual(2, len(DoGet(_REMOTE, '/queries/%s/answers' % a))) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2096 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2097 s = DoGet(_REMOTE, '/queries/%s/answers/0' % a) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2098 self.assertTrue('content' in s) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2099 self.assertTrue('retrieve' in s) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2100 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2101 s = DoGet(_REMOTE, '/queries/%s/answers/0/content?simplify' % a) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2102 self.assertEqual('887', s['PatientID']) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2103 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', s['StudyInstanceUID']) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2104 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2105 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2106 DoPost(_REMOTE, '/queries/%s/answers/0/retrieve' % a, 'ORTHANC') |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2107 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2108 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2109 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2110 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2111 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2112 DoPost(_REMOTE, '/queries/%s/answers/1/retrieve' % a, 'ORTHANC', 'application/json') # make sure the issue #36 is fixed (query/retrieve Rest API: /retrieve route shall accept application/json content type) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2113 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2114 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2115 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2116 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2117 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2118 # New in Orthanc 1.4.3 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2119 s = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2120 self.assertEqual(2, len(s)) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2121 for i in range(2): |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2122 self.assertEqual('SERIES', s[i]['QueryRetrieveLevel']) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2123 self.assertEqual('887', s[i]['PatientID']) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2124 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', s[i]['StudyInstanceUID']) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2125 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2126 DoDelete(_REMOTE, '/queries/%s' % a) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2127 self.assertEqual(0, len(DoGet(_REMOTE, '/queries'))) |
| 14 | 2128 |
| 2129 | |
| 2130 def test_parent(self): | |
| 2131 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 2132 patient = '6816cb19-844d5aee-85245eba-28e841e6-2414fae2' | |
| 2133 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' | |
| 2134 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 2135 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d' | |
|
107
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
2136 self.assertEqual(instance, u) |
| 14 | 2137 |
| 2138 a = DoGet(_REMOTE, '/studies/%s/patient' % study) | |
| 2139 self.assertEqual('Patient', a['Type']) | |
| 2140 self.assertEqual(patient, a['ID']) | |
| 2141 | |
| 2142 a = DoGet(_REMOTE, '/series/%s/patient' % series) | |
| 2143 self.assertEqual('Patient', a['Type']) | |
| 2144 self.assertEqual(patient, a['ID']) | |
| 2145 | |
| 2146 a = DoGet(_REMOTE, '/series/%s/study' % series) | |
| 2147 self.assertEqual('Study', a['Type']) | |
| 2148 self.assertEqual(study, a['ID']) | |
| 2149 | |
| 2150 a = DoGet(_REMOTE, '/instances/%s/patient' % instance) | |
| 2151 self.assertEqual('Patient', a['Type']) | |
| 2152 self.assertEqual(patient, a['ID']) | |
| 2153 | |
| 2154 a = DoGet(_REMOTE, '/instances/%s/study' % instance) | |
| 2155 self.assertEqual('Study', a['Type']) | |
| 2156 self.assertEqual(study, a['ID']) | |
| 2157 | |
| 2158 a = DoGet(_REMOTE, '/instances/%s/series' % instance) | |
| 2159 self.assertEqual('Series', a['Type']) | |
| 2160 self.assertEqual(series, a['ID']) | |
| 2161 | |
| 2162 | |
| 2163 def test_shanon(self): | |
| 2164 def Anonymize(instance, replacements = {}): | |
| 119 | 2165 return DoPost(_REMOTE, '/instances/%s/anonymize' % instance, { |
| 2166 'Replace' : replacements, | |
| 2167 'Force' : True, | |
| 2168 }, 'application/json') | |
| 14 | 2169 |
| 2170 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 2171 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 2172 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 2173 | |
| 2174 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ] | |
| 2175 ids = [ 'ozp00SjY2xG', | |
| 2176 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 2177 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 2178 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ] | |
| 2179 | |
| 2180 a = ExtractDicomTags(Anonymize(u), tags) | |
| 2181 for i in range(4): | |
| 2182 self.assertNotEqual(ids[i], a[i]) | |
| 2183 self.assertTrue(a[4].startswith('Orthanc')) | |
| 2184 | |
| 2185 a = ExtractDicomTags(Anonymize(u, { 'PatientName' : 'toto' }), tags) | |
| 2186 for i in range(4): | |
| 2187 self.assertNotEqual(ids[i], a[i]) | |
| 2188 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2189 | |
| 2190 a = ExtractDicomTags(Anonymize(u, { 'SOPInstanceUID' : 'instance' }), tags) | |
| 2191 self.assertEqual('instance', a[3]) | |
| 2192 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2193 | |
| 2194 a = ExtractDicomTags(Anonymize(u, { 'SeriesInstanceUID' : 'series' }), tags) | |
| 2195 self.assertEqual('series', a[2]) | |
| 2196 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2197 | |
| 2198 a = ExtractDicomTags(Anonymize(u, { 'StudyInstanceUID' : 'study' }), tags) | |
| 2199 self.assertEqual('study', a[1]) | |
| 2200 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2201 | |
| 2202 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient' }), tags) | |
| 2203 self.assertEqual('patient', a[0]) | |
| 2204 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2205 | |
| 2206 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient', | |
| 2207 'StudyInstanceUID' : 'study', | |
| 2208 'SeriesInstanceUID' : 'series', | |
| 2209 'SOPInstanceUID' : 'instance' }), tags) | |
| 2210 self.assertEqual('patient', a[0]) | |
| 2211 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2212 | |
| 2213 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 2214 | |
| 2215 | |
| 2216 def test_shanon_2(self): | |
| 2217 def Modify(instance, replacements = {}): | |
| 119 | 2218 return DoPost(_REMOTE, '/instances/%s/modify' % instance, { |
| 2219 'Replace' : replacements, | |
| 2220 'Force': True, | |
| 2221 }, 'application/json') | |
| 14 | 2222 |
| 2223 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 2224 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 2225 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 2226 | |
| 2227 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ] | |
| 2228 ids = [ 'ozp00SjY2xG', | |
| 2229 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 2230 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 2231 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ] | |
| 2232 | |
| 2233 a = ExtractDicomTags(Modify(u), tags) | |
| 2234 self.assertEqual(ids[0], a[0]) | |
| 2235 self.assertEqual(ids[1], a[1]) | |
| 2236 self.assertEqual(ids[2], a[2]) | |
| 2237 self.assertNotEqual(ids[3], a[3]) | |
| 2238 self.assertEqual(0, len(a[4])) | |
| 2239 | |
| 2240 a = ExtractDicomTags(Modify(u, { 'SOPInstanceUID' : 'instance' }), tags) | |
| 2241 self.assertEqual(ids[0], a[0]) | |
| 2242 self.assertEqual(ids[1], a[1]) | |
| 2243 self.assertEqual(ids[2], a[2]) | |
| 2244 self.assertEqual('instance', a[3]) | |
| 2245 | |
| 2246 a = ExtractDicomTags(Modify(u, { 'SeriesInstanceUID' : 'series' }), tags) | |
| 2247 self.assertEqual(ids[0], a[0]) | |
| 2248 self.assertEqual(ids[1], a[1]) | |
| 2249 self.assertEqual('series', a[2]) | |
| 2250 self.assertNotEqual(ids[3], a[3]) | |
| 2251 | |
| 2252 a = ExtractDicomTags(Modify(u, { 'StudyInstanceUID' : 'study' }), tags) | |
| 2253 self.assertEqual(ids[0], a[0]) | |
| 2254 self.assertEqual('study', a[1]) | |
| 2255 self.assertNotEqual(ids[2], a[2]) | |
| 2256 self.assertNotEqual(ids[3], a[3]) | |
| 2257 | |
| 2258 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient' }), tags) | |
| 2259 self.assertEqual('patient', a[0]) | |
| 2260 self.assertNotEqual(ids[1], a[1]) | |
| 2261 self.assertNotEqual(ids[2], a[2]) | |
| 2262 self.assertNotEqual(ids[3], a[3]) | |
| 2263 | |
| 2264 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient', | |
| 2265 'StudyInstanceUID' : 'study', | |
| 2266 'SeriesInstanceUID' : 'series', | |
| 2267 'SOPInstanceUID' : 'instance' }), tags) | |
| 2268 self.assertEqual('patient', a[0]) | |
| 2269 self.assertEqual('study', a[1]) | |
| 2270 self.assertEqual('series', a[2]) | |
| 2271 self.assertEqual('instance', a[3]) | |
| 2272 | |
| 2273 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 2274 | |
| 2275 | |
| 2276 def test_instances_tags(self): | |
| 2277 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 2278 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')['ID'] | |
| 2279 #a = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386937.676343')['ID'] | |
| 2280 #b = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386925.676329')['ID'] | |
| 2281 | |
| 2282 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/patients')[0]) | |
| 2283 self.assertEqual(2, len(i)) | |
| 2284 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 2285 self.assertEqual('887', i[i.keys()[1]]['PatientID']) | |
| 2286 | |
| 2287 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/studies')[0]) | |
| 2288 self.assertEqual(2, len(i)) | |
| 2289 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 2290 self.assertEqual('887', i[i.keys()[1]]['PatientID']) | |
| 2291 | |
| 2292 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 2293 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[0]) | |
| 2294 self.assertEqual(1, len(i)) | |
| 2295 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 2296 | |
| 2297 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[1]) | |
| 2298 self.assertEqual(1, len(i)) | |
| 2299 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 2300 | |
|
136
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2301 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
|
2302 self.assertEqual(1, len(i)) |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2303 self.assertEqual('887', i[i.keys()[0]]['0010,0020']) |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2304 |
| 14 | 2305 |
| 2306 def test_lookup(self): | |
| 2307 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG') | |
| 2308 self.assertEqual(0, len(a)) | |
| 2309 | |
| 2310 UploadInstance(_REMOTE, 'DummyCT.dcm') | |
| 2311 | |
| 2312 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG') | |
| 2313 self.assertEqual(1, len(a)) | |
| 2314 self.assertEqual('Patient', a[0]['Type']) | |
| 2315 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', a[0]['ID']) | |
| 2316 self.assertEqual('/patients/%s' % a[0]['ID'], a[0]['Path']) | |
| 2317 | |
| 2318 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390') | |
| 2319 self.assertEqual(1, len(a)) | |
| 2320 self.assertEqual('Study', a[0]['Type']) | |
| 2321 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', a[0]['ID']) | |
| 2322 self.assertEqual('/studies/%s' % a[0]['ID'], a[0]['Path']) | |
| 2323 | |
| 2324 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394') | |
| 2325 self.assertEqual(1, len(a)) | |
| 2326 self.assertEqual('Series', a[0]['Type']) | |
| 2327 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', a[0]['ID']) | |
| 2328 self.assertEqual('/series/%s' % a[0]['ID'], a[0]['Path']) | |
| 2329 | |
| 2330 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109') | |
| 2331 self.assertEqual(1, len(a)) | |
| 2332 self.assertEqual('Instance', a[0]['Type']) | |
| 2333 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a[0]['ID']) | |
| 2334 self.assertEqual('/instances/%s' % a[0]['ID'], a[0]['Path']) | |
| 2335 | |
| 2336 DropOrthanc(_REMOTE) | |
| 2337 a = DoPost(_REMOTE, '/tools/lookup', '3113719P') | |
| 2338 self.assertEqual(0, len(a)) | |
| 2339 | |
| 15 | 2340 |
| 2341 def test_autorouting(self): | |
| 2342 knee1 = 'Knee/T1/IM-0001-0001.dcm' | |
| 2343 knee2 = 'Knee/T2/IM-0001-0002.dcm' | |
| 2344 other = 'Brainix/Flair/IM-0001-0001.dcm' | |
| 2345 | |
| 2346 # Check that this version is >= 0.8.0 | |
| 2347 self.assertTrue(IsDefinedInLua(_REMOTE, '_InitializeJob')) | |
| 2348 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities')) | |
| 2349 | |
| 2350 UploadInstance(_REMOTE, knee1) | |
| 2351 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 2352 | |
| 2353 DropOrthanc(_REMOTE) | |
| 2354 DropOrthanc(_LOCAL) | |
| 174 | 2355 InstallLuaScriptFromPath(_REMOTE, 'Lua/Autorouting.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(3, len(DoGet(_LOCAL, '/instances'))) |
| 2362 | |
| 2363 DropOrthanc(_REMOTE) | |
| 2364 DropOrthanc(_LOCAL) | |
| 174 | 2365 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingConditional.lua') |
| 15 | 2366 UploadInstance(_REMOTE, knee1) |
| 2367 UploadInstance(_REMOTE, knee2) | |
| 2368 UploadInstance(_REMOTE, other) | |
| 2369 WaitEmpty(_REMOTE) | |
| 174 | 2370 UninstallLuaCallbacks(_REMOTE) |
| 15 | 2371 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
| 2372 | |
| 2373 DropOrthanc(_REMOTE) | |
| 2374 DropOrthanc(_LOCAL) | |
| 174 | 2375 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingModification.lua') |
| 15 | 2376 UploadInstance(_REMOTE, knee1) |
| 2377 WaitEmpty(_REMOTE) | |
| 174 | 2378 UninstallLuaCallbacks(_REMOTE) |
| 15 | 2379 i = DoGet(_LOCAL, '/instances') |
| 2380 self.assertEqual(1, len(i)) | |
| 2381 | |
| 2382 with tempfile.NamedTemporaryFile(delete = True) as f: | |
| 2383 f.write(DoGet(_LOCAL, '/instances/%s/file' % i[0])) | |
| 2384 f.flush() | |
| 45 | 2385 routed = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ]) |
| 15 | 2386 self.assertEqual('My Medical Device', re.search('"StationName">(.*?)<', routed).group(1).strip()) |
| 2387 self.assertEqual(None, re.search('"MilitaryRank"', routed)) | |
| 2388 self.assertEqual(None, re.search('"0051,0010"', routed)) # A private tag | |
| 17 | 2389 |
| 2390 | |
| 2391 def test_storescu_rf(self): | |
| 2392 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] | |
| 2393 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 2394 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 2395 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 18 | 2396 |
| 2397 | |
| 2398 def test_anonymize_instance(self): | |
| 2399 def AnonymizeAndUpload(instanceId, parameters): | |
| 2400 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/anonymize' % instanceId, parameters, | |
| 2401 'application/json'), 'application/dicom')['ID'] | |
| 2402 | |
| 2403 def ModifyAndUpload(instanceId, parameters): | |
| 2404 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/modify' % instanceId, parameters, | |
| 2405 'application/json'), 'application/dicom')['ID'] | |
| 2406 | |
| 2407 a = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] | |
| 2408 s1 = DoGet(_REMOTE, '/instances/%s/content/PatientName' % a) | |
| 2409 s2 = DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % a) # Some private tag | |
| 2410 s3 = DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % a) | |
| 2411 s4 = DoGet(_REMOTE, '/instances/%s/content/SeriesDescription' % a) | |
| 2412 s5 = DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a) | |
| 2413 | |
| 2414 b = AnonymizeAndUpload(a, '{}') | |
| 2415 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2416 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2417 | |
| 2418 # Keep private tag (only OK since Orthanc 0.8.0) | |
| 2419 b = AnonymizeAndUpload(a, '{"Keep":["00e1-10c2"]}') | |
| 2420 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2421 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2422 | |
| 2423 b = AnonymizeAndUpload(a, '{"Keep":["00e1,10c2","PatientName"]}') | |
| 2424 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2425 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2426 | |
| 2427 b = AnonymizeAndUpload(a, '{"Keep":["PatientName"],"Replace":{"00e1,10c2":"Hello"}}') | |
| 2428 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2429 self.assertTrue(DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b).startswith('Hello')) | |
| 2430 | |
| 2431 # Examples from the Wiki | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
2432 b = AnonymizeAndUpload(a, '{"Replace":{"PatientName":"hello","0010-0020":"world"},"Keep":["StudyDescription", "SeriesDescription"],"KeepPrivateTags": 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.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b)) | |
| 2438 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2439 DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a) | |
| 2440 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 2441 | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
2442 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Remove":["InstitutionName"],"RemovePrivateTags": true,"Force":true}') |
| 18 | 2443 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip()) |
| 2444 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip()) | |
| 2445 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b)) | |
| 2446 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b)) | |
| 2447 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2448 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 2449 | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
2450 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Force":true}') |
| 18 | 2451 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip()) |
| 2452 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip()) | |
| 2453 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1,10c2' % b)) | |
| 2454 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b)) | |
| 2455 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b)) | |
| 2456 self.assertEqual(s5, DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 2457 | |
| 2458 | |
| 2459 # Test modify non-existing | |
| 2460 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2461 json.dumps({ | |
| 2462 'PatientName' : 'Jodogne', | |
| 2463 'Modality' : 'CT', | |
| 2464 }))['ID'] | |
| 2465 | |
| 2466 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i).strip()) | |
| 2467 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % i)) | |
| 2468 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i).strip()) | |
| 2469 | |
| 2470 b = ModifyAndUpload(i, '{"Replace":{"StudyDescription":"hello","Modality":"world"}}') | |
| 2471 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % b).strip()) | |
| 2472 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % b).strip()) | |
| 2473 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/Modality' % b).strip()) | |
| 2474 | |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2475 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2476 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
|
2477 # 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
|
2478 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
|
2479 |
|
468
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2480 def storescu(image, acceptUnknownSopClassUid, expectSuccess = True, retries = 1): |
|
61
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2481 if acceptUnknownSopClassUid: |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2482 tmp = [ '-xf', GetDatabasePath('UnknownSopClassUid.cfg'), 'Default' ] |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2483 else: |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2484 tmp = [ '-xs' ] |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2485 |
|
468
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2486 while retries > 0: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2487 retries -= 1 |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2488 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
|
2489 try: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2490 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
|
2491 [ _REMOTE['Server'], str(_REMOTE['DicomPort']), |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2492 GetDatabasePath(image) ], |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2493 stderr = FNULL) |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2494 |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2495 if expectSuccess: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2496 return |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2497 except subprocess.CalledProcessError as e: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2498 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
|
2499 if not expectSuccess: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2500 raise e |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2501 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2502 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
|
2503 |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2504 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
|
2505 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
|
2506 '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
|
2507 ]) |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2508 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
|
2509 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
|
2510 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
|
2511 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
|
2512 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
|
2513 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
|
2514 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
|
2515 else: |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2516 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
|
2517 |
| 490 | 2518 # 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
|
2519 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
|
2520 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
|
2521 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
|
2522 |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2523 if IsOrthancVersionAbove(_REMOTE, 1, 9, 0): |
| 374 | 2524 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
|
2525 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
|
2526 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
|
2527 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
|
2528 else: |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2529 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
|
2530 |
|
62
f9c4ce95756f
removal of useless information
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
2531 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
|
2532 storescu('Knix/Loc/IM-0001-0001.dcm', False) |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2533 storescu('UnknownSopClassUid.dcm', True) |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2534 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2535 |
|
463
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
2536 # set back normal verbosity |
|
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
2537 DoPut(_REMOTE, '/tools/log-level', 'default') |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2538 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2539 def test_storescu_jpeg(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2540 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2541 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2542 knixStudy = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' |
| 64 | 2543 i = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm')['ID'] |
| 2544 | |
| 2545 # This is JPEG lossless | |
|
136
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2546 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header' % i)['0002,0010']['Value']) |
| 64 | 2547 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
|
2548 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header?short' % i)['0002,0010']) |
| 64 | 2549 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2550 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm') |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2551 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0003.dcm') |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2552 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2553 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
|
2554 b = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2555 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2556 DoPost(_REMOTE, '/modalities/orthanctest/store', [ knixStudy, a, b ]) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2557 self.assertEqual(5, len(DoGet(_LOCAL, '/instances'))) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2558 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2559 self.assertEqual(3, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2560 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2561 DropOrthanc(_REMOTE) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2562 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
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 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2565 def test_pixel_data(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2566 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
|
2567 color = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2568 phenix = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2569 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2570 phenixSize = 358 * 512 * 2 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2571 colorSize = 1000 * 1000 * 3 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2572 jpegSize = 51918 |
|
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 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
|
2575 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
|
2576 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
|
2577 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2578 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
|
2579 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
|
2580 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2581 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
|
2582 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
|
2583 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2584 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2585 def test_decode_brainix(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2586 brainix = [ |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2587 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'], # (*) |
| 384 | 2588 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
|
2589 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
|
2590 ] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2591 h = '6fb11b932d535c2be04beabd99793ff8' |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2592 maxValue = 426.0 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2593 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2594 truth = Image.open(GetDatabasePath('Formats/Brainix.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2595 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2596 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2597 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2598 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2599 truth2 = map(lambda x: min(255, x), truth.getdata()) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2600 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2601 self.AssertSameImages(truth2, '/instances/%s/image-uint8' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2602 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2603 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
|
2604 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2605 self.AssertSameImages(truth2, '/instances/%s/preview' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2606 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2607 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2608 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
|
2609 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2610 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2611 def test_decode_color(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2612 imagej = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2613 color = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID'] |
|
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 for i in [ imagej, color ]: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2616 for j in [ 'image-uint8', 'image-uint16', 'image-int16' ]: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2617 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
|
2618 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2619 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
|
2620 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
|
2621 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2622 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
|
2623 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
|
2624 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2625 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2626 def test_decode_rf(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2627 rf = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2628 truth = Image.open(GetDatabasePath('Formats/KarstenHilbertRF.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2629 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2630 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2631 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2632 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2633 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2634 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2635 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
|
2636 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2637 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2638 def test_decode_multiframe(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2639 mf = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] |
|
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 first frame |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2642 truth = Image.open(GetDatabasePath('Formats/Multiframe0.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2643 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2644 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2645 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2646 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2647 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
|
2648 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2649 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
|
2650 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2651 # Test the last frame |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2652 truth = Image.open(GetDatabasePath('Formats/Multiframe75.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2653 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
|
2654 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2655 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2656 def test_decode_signed(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2657 signed = UploadInstance(_REMOTE, 'SignedCT.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2658 minValue = -2000 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2659 maxValue = 4042 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2660 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2661 truth = Image.open(GetDatabasePath('Formats/SignedCT.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2662 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % 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 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
|
2665 self.AssertSameImages(truth2, '/instances/%s/image-uint16' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2666 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2667 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
|
2668 self.AssertSameImages(truth3, '/instances/%s/image-uint8' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2669 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2670 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
|
2671 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
|
2672 self.AssertSameImages(tmp, '/instances/%s/preview' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2673 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2674 self.assertEqual('b57e6c872a3da50877c7da689b03a444', ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % signed))) |
| 22 | 2675 |
| 2676 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
2677 def test_googlecode_issue_32(self): |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2678 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/default-encoding', 'nope')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2679 self.assertEqual('Windows1251', DoPut(_REMOTE, '/tools/default-encoding', 'Windows1251')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2680 self.assertEqual('Windows1251', DoGet(_REMOTE, '/tools/default-encoding')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2681 |
| 22 | 2682 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID'] |
| 2683 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f) | |
| 2684 self.assertEqual(u'Рентгенография', tags['SeriesDescription']) | |
| 2685 self.assertEqual(u'Таз', tags['BodyPartExamined']) | |
| 2686 self.assertEqual(u'Прямая', tags['ViewPosition']) | |
| 2687 | |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2688 # 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
|
2689 self.assertEqual('Latin1', DoPut(_REMOTE, '/tools/default-encoding', 'Latin1')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2690 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2691 DoDelete(_REMOTE, '/instances/%s' % f) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2692 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID'] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2693 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2694 self.assertNotEqual(u'Рентгенография', tags['SeriesDescription']) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2695 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2696 |
| 22 | 2697 def test_encodings(self): |
| 23 | 2698 # Latin-1 (ISO_IR 100) |
| 22 | 2699 brainix = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
| 2700 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % brainix) | |
| 2701 self.assertEqual(u'IRM cérébrale, neuro-crâne', tags['StudyDescription']) | |
| 23 | 2702 |
| 2703 # Latin-2 (ISO_IR 101) | |
| 2704 a = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID'] | |
| 2705 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % a) | |
| 2706 # dcm2xml MarekLatin2.dcm | iconv -f latin2 -t utf-8 | xmllint --format - | |
| 2707 self.assertEqual('Imię i Nazwisko osoby opisującej', | |
| 2708 i['ContentSequence'][4]['ConceptNameCodeSequence'][0]['CodeMeaning'].encode('utf-8')) | |
| 2709 | |
|
26
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2710 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2711 def test_storescu_custom_aet(self): |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2712 # 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
|
2713 # 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
|
2714 # in the REST API)." |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2715 # 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
|
2716 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2717 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2718 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2719 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2720 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2721 c = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0003.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2722 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2723 j = DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2724 'LocalAet' : 'YOP', |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2725 'Resources' : [ a['ID'], b['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(2, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2729 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
|
2730 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2731 DropOrthanc(_LOCAL) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2732 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2733 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2734 j = DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2735 'Resources' : [ c['ID'] ] |
|
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 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2738 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2739 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
|
2740 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2741 DropOrthanc(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2742 DropOrthanc(_LOCAL) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2743 |
| 174 | 2744 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingChangeAet.lua') |
|
26
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2745 DoPost(_REMOTE, '/tools/execute-script', 'aet = "HELLO"', 'application/lua') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2746 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2747 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2748 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2749 WaitEmpty(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2750 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2751 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
|
2752 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2753 DoPost(_REMOTE, '/tools/execute-script', 'aet = nill', 'application/lua') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2754 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2755 WaitEmpty(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2756 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2757 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
|
2758 |
|
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 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
|
2760 # 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
|
2761 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
|
2762 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
|
2763 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
|
2764 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
|
2765 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
|
2766 |
|
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, '/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
|
2768 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
|
2769 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
|
2770 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
|
2771 |
|
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.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
|
2773 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
|
2774 |
|
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(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
|
2776 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
|
2777 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
|
2778 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
|
2779 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
|
2780 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
|
2781 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
|
2782 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
|
2783 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
|
2784 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
|
2785 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
|
2786 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
|
2787 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
|
2788 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
|
2789 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
|
2790 |
|
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 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
|
2792 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
|
2793 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
|
2794 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
|
2795 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
|
2796 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
|
2797 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
|
2798 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2799 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
|
2800 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
|
2801 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
|
2802 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2803 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
|
2804 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
|
2805 self.assertTrue(instance in s) |
| 36 | 2806 |
| 2807 | |
| 2808 def test_create_pdf(self): | |
| 2809 # Upload 4 instances | |
| 2810 brainixInstance = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] | |
| 2811 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 2812 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 2813 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 2814 | |
| 2815 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0' | |
| 2816 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' | |
| 2817 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8' | |
| 2818 | |
| 2819 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f: | |
| 2820 pdf = f.read() | |
| 2821 | |
| 2822 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2823 json.dumps({ | |
| 2824 'Tags' : { | |
| 2825 'PatientName' : 'Jodogne', | |
| 2826 'Modality' : 'CT', | |
| 2827 }, | |
| 2828 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 2829 })) | |
| 2830 | |
| 2831 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
|
2832 # 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
|
2833 # 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
|
2834 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip()) |
| 36 | 2835 |
| 2836 b = DoGet(_REMOTE, '/instances/%s/content/0042-0011' % i['ID']) | |
| 2837 self.assertEqual(len(b), len(pdf) + 1) | |
| 2838 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf + '\0')) | |
| 2839 | |
| 2840 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/tools/create-dicom', | |
| 2841 json.dumps({ | |
| 2842 'Parent' : brainixPatient, | |
| 2843 'Tags' : { | |
| 2844 'PatientName' : 'Jodogne', | |
| 2845 } | |
| 2846 }))) | |
| 2847 | |
| 2848 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2849 json.dumps({ | |
| 2850 'Parent' : brainixPatient, | |
| 2851 'Tags' : { 'StudyDescription' : 'PDF^Patient' }, | |
| 2852 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 2853 })) | |
| 2854 | |
| 2855 self.assertEqual(brainixPatient, DoGet(_REMOTE, '/instances/%s/patient' % i['ID'])['ID']) | |
| 2856 | |
| 2857 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2858 json.dumps({ | |
| 2859 'Parent' : brainixStudy, | |
| 2860 'Tags' : { 'SeriesDescription' : 'PDF^Study' }, | |
| 2861 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 2862 })) | |
| 2863 | |
| 2864 self.assertEqual(brainixStudy, DoGet(_REMOTE, '/instances/%s/study' % i['ID'])['ID']) | |
| 2865 | |
| 2866 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2867 json.dumps({ | |
| 2868 'Parent' : brainixEpi, | |
| 37 | 2869 'Tags' : { 'SpecificCharacterSet' : 'ISO_IR 13' }, |
| 36 | 2870 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) |
| 2871 })) | |
| 2872 | |
| 2873 self.assertEqual(brainixEpi, DoGet(_REMOTE, '/instances/%s/series' % i['ID'])['ID']) | |
| 2874 | |
| 2875 b = DoGet(_REMOTE, '/instances/%s/pdf' % i['ID']) | |
| 2876 self.assertEqual(len(b), len(pdf)) | |
| 2877 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf)) | |
| 2878 | |
| 2879 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/pdf' % brainixInstance)) | |
| 38 | 2880 |
| 2881 | |
| 2882 def test_create_series(self): | |
| 2883 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2884 json.dumps({ | |
| 2885 'Tags' : { | |
| 40 | 2886 'SpecificCharacterSet' : 'ISO_IR 100', |
| 2887 'PatientName' : 'Sébastien Jodogne', | |
| 38 | 2888 'Modality' : 'CT', |
| 2889 }, | |
| 2890 'Content' : [ | |
| 40 | 2891 { |
| 2892 'Content': 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==', # red dot in RGBA | |
| 2893 'Tags' : { 'ImageComments' : 'Tutu' } | |
| 2894 }, | |
| 38 | 2895 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAoUlEQVQ4jZ2SWw3EIBREjwUsYAELa2EtoAULFUCyXAtroRZqoRbox254BdLC/DZnZjoXWJFgCDg8egW2CBEhEnDzyRk+Ecxz2KP/0AL8S99T+jQccAVs22qKwAuPuq0uyNg9cPLh3am+pe/dkHLZtqJHj6vXJrZ7nvzvxxgemXgUwnGfXqpee09mUwp8m022OYP6bLF7mVuVe0y/umxinsAXRd9z0k1ubWsAAAAASUVORK5CYII=', |
| 2896 ] | |
| 2897 })) | |
| 2898 | |
| 2899 s = DoGet(_REMOTE, i['Path']) | |
| 2900 self.assertEqual('Series', s['Type']) | |
| 2901 self.assertEqual(s['ID'], i['ID']) | |
| 2902 self.assertEqual(2, len(s['Instances'])) | |
| 39 | 2903 self.assertEqual(2, s['ExpectedNumberOfInstances']) |
| 2904 self.assertEqual('Complete', s['Status']) | |
| 40 | 2905 |
| 2906 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][0]) | |
| 2907 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][1]) | |
| 2908 self.assertTrue('ImageComments' in a or 'ImageComments' in b) | |
| 2909 if 'ImageComments' in a: | |
| 2910 self.assertEqual('Tutu', a['ImageComments']) | |
| 2911 else: | |
| 2912 self.assertEqual('Tutu', b['ImageComments']) | |
| 2913 | |
| 2914 patient = DoGet(_REMOTE, '/instances/%s/patient' % s['Instances'][0]) | |
| 2915 self.assertEqual(patient['MainDicomTags']['PatientName'].encode('utf-8'), | |
| 2916 'Sébastien Jodogne') | |
| 47 | 2917 |
| 2918 | |
| 2919 def test_create_binary(self): | |
| 2920 binary = ''.join(map(chr, range(256))) | |
| 2921 encoded = 'data:application/octet-stream;base64,' + base64.b64encode(binary) | |
| 2922 tags = { | |
| 2923 'PatientName' : 'Jodogne', | |
| 2924 '8899-8899' : encoded | |
| 2925 } | |
| 2926 | |
| 2927 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2928 json.dumps({ | |
| 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(binary, DoGet(_REMOTE, '/instances/%s/content/8899-8899' % i['ID']).strip()) | |
| 2935 | |
| 2936 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2937 json.dumps({ | |
| 2938 'InterpretBinaryTags' : False, | |
| 266 | 2939 'Tags' : tags, |
| 2940 'PrivateCreator' : 'TestBinary', | |
| 47 | 2941 })) |
| 2942 | |
| 2943 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 2944 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
|
2945 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2946 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2947 def test_patient_ids_collision(self): |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2948 # 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
|
2949 # same PatientID |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2950 for i in range(3): |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2951 UploadInstance(_REMOTE, 'PatientIdsCollision/Image%d.dcm' % (i + 1)) |
|
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' : 'Patient', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2954 'Query' : { 'PatientName' : '*' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2955 self.assertEqual(1, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2956 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
|
2957 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2958 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2959 'CaseSensitive' : True, |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2960 'Query' : { 'PatientName' : 'FOO\\HELLO' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2961 self.assertEqual(2, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2962 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2963 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2964 'CaseSensitive' : False, |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2965 'Query' : { 'PatientName' : 'Foo' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2966 self.assertEqual(1, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2967 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
|
2968 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
|
2969 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
|
2970 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2971 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2972 'Query' : { 'PatientName' : '*' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2973 self.assertEqual(3, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2974 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
|
2975 self.assertTrue('FOO^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2976 self.assertTrue('HELLO^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2977 self.assertTrue('WORLD^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2978 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2979 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
|
2980 self.assertEqual(1, len(set(d))) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2981 self.assertEqual('COMMON', d[0]) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2982 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2983 for i in a: |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2984 d = DoGet(_REMOTE, '/studies/%s' % i) ['MainDicomTags']['StudyDescription'] |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2985 p = DoGet(_REMOTE, '/studies/%s' % i) ['PatientMainDicomTags']['PatientName'] |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2986 self.assertEqual('%s^SERIES' % p, d) |
|
49
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2987 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2988 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2989 def test_bitbucket_issue_4(self): |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2990 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2991 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2992 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2993 UploadInstance(_REMOTE, 'Formats/Jpeg.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2994 UploadInstance(_REMOTE, 'Formats/JpegLossless.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2995 UploadInstance(_REMOTE, 'Formats/Rle.dcm') |
|
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 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2998 self.assertEqual(6, len(DoGet(_REMOTE, '/instances'))) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2999 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3000 p = DoGet(_REMOTE, '/patients') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3001 self.assertEqual(2, len(p)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3002 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
|
3003 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
|
3004 self.assertEqual(3, len(i1)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3005 self.assertEqual(3, len(i2)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3006 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3007 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
|
3008 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3009 self.assertEqual(6, len(DoGet(_LOCAL, '/instances'))) |
|
50
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3010 |
|
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 def test_create_sequence(self): |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3013 i = DoPost(_REMOTE, '/tools/create-dicom', |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3014 json.dumps({ |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3015 'Tags' : { |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3016 'SpecificCharacterSet': 'ISO_IR 100', # Encode using Latin1 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3017 'PatientName': 'Jodogne^', |
|
51
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3018 'ReferencedStudySequence': GenerateTestSequence(), |
|
50
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3019 } |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3020 }))['ID'] |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3021 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3022 self.assertEqual('Jodogne^', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i)) |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3023 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
|
3024 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
|
3025 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
|
3026 self.assertEqual(u'Sébastien^'.encode('latin-1'), |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3027 DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence/1/StudyDescription' % i)) |
|
51
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3028 |
|
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 def test_modify_sequence(self): |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3031 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3032 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
|
3033 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3034 j = DoPost(_REMOTE, '/instances/%s/modify' % i, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3035 json.dumps({ |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3036 "Replace" : { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3037 "PatientName" : "hello", |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3038 'ReferencedStudySequence': GenerateTestSequence(), |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3039 }, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3040 }), |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3041 'application/json') |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3042 j = DoPost(_REMOTE, '/instances', j, 'application/dicom')['ID'] |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3043 DoDelete(_REMOTE, '/instances/%s' % i) |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3044 |
| 52 | 3045 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence' % j))) |
| 3046 | |
| 3047 | |
| 3048 def test_compression(self): | |
| 3049 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 3050 | |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3051 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
|
3052 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
|
3053 # 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
|
3054 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
|
3055 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
|
3056 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3057 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
|
3058 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
|
3059 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
|
3060 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3061 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
|
3062 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3063 # 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
|
3064 # 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
|
3065 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
|
3066 DoPost(_REMOTE, '/instances/%s/attachments/dicom/uncompress' % i) |
| 52 | 3067 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3068 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
|
3069 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
|
3070 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
|
3071 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
|
3072 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
|
3073 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
|
3074 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
|
3075 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3076 ops = DoGet(_REMOTE, '/instances/%s/attachments/dicom' % i) |
| 52 | 3077 self.assertTrue('compress' in ops) |
| 3078 self.assertTrue('uncompress' in ops) | |
| 3079 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
|
3080 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
|
3081 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
|
3082 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3083 # Re-compress the attachment |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3084 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
|
3085 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
|
3086 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
|
3087 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
|
3088 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
|
3089 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
|
3090 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
|
3091 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
|
3092 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
|
3093 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
|
3094 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3095 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
|
3096 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
|
3097 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
|
3098 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
|
3099 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
|
3100 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
|
3101 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
|
3102 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
|
3103 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
|
3104 self.assertEqual(us, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 53 | 3105 |
| 3106 | |
| 3107 def test_ordered_slices(self): | |
| 3108 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] | |
| 3109 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 3110 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 3111 self.assertEqual('Sequence', o['Type']) | |
| 3112 self.assertEqual(1, len(o['Dicom'])) | |
| 3113 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/file', o['Dicom'][0]) | |
| 3114 self.assertEqual(76, len(o['Slices'])) | |
| 3115 for j in range(76): | |
| 3116 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/frames/%d' % j, o['Slices'][j]) | |
| 3117 | |
| 68 | 3118 self.assertEqual(1, len(o['SlicesShort'])) |
| 3119 self.assertEqual('9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02', o['SlicesShort'][0][0]) | |
| 3120 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 3121 self.assertEqual(76, o['SlicesShort'][0][2]) | |
| 3122 | |
| 53 | 3123 i = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
| 3124 j = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')['ID'] | |
| 3125 k = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')['ID'] | |
| 3126 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 3127 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 3128 | |
| 3129 self.assertEqual('Volume', o['Type']) | |
| 3130 self.assertEqual(3, len(o['Dicom'])) | |
| 3131 self.assertEqual(3, len(o['Slices'])) | |
| 3132 self.assertEqual('/instances/%s/file' % i, o['Dicom'][2]) | |
| 3133 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1]) | |
| 3134 self.assertEqual('/instances/%s/file' % k, o['Dicom'][0]) | |
| 3135 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][2]) | |
| 3136 self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1]) | |
| 3137 self.assertEqual('/instances/%s/frames/0' % k, o['Slices'][0]) | |
| 3138 | |
| 68 | 3139 self.assertEqual(3, len(o['SlicesShort'])) |
| 3140 self.assertEqual(k, o['SlicesShort'][0][0]) | |
| 3141 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 3142 self.assertEqual(1, o['SlicesShort'][0][2]) | |
| 3143 self.assertEqual(j, o['SlicesShort'][1][0]) | |
| 3144 self.assertEqual(0, o['SlicesShort'][1][1]) | |
| 3145 self.assertEqual(1, o['SlicesShort'][1][2]) | |
| 3146 self.assertEqual(i, o['SlicesShort'][2][0]) | |
| 3147 self.assertEqual(0, o['SlicesShort'][2][1]) | |
| 3148 self.assertEqual(1, o['SlicesShort'][2][2]) | |
| 3149 | |
| 53 | 3150 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID'] |
| 3151 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm')['ID'] | |
| 3152 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 3153 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 3154 | |
| 3155 self.assertEqual('Sequence', o['Type']) | |
| 3156 self.assertEqual(2, len(o['Dicom'])) | |
| 3157 self.assertEqual(2, len(o['Slices'])) | |
| 3158 self.assertEqual('/instances/%s/file' % i, o['Dicom'][0]) | |
| 3159 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1]) | |
| 3160 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][0]) | |
| 3161 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
|
3162 |
| 68 | 3163 self.assertEqual(2, len(o['SlicesShort'])) |
| 3164 self.assertEqual(i, o['SlicesShort'][0][0]) | |
| 3165 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 3166 self.assertEqual(1, o['SlicesShort'][0][2]) | |
| 3167 self.assertEqual(j, o['SlicesShort'][1][0]) | |
| 3168 self.assertEqual(0, o['SlicesShort'][1][1]) | |
| 3169 self.assertEqual(1, o['SlicesShort'][1][2]) | |
| 3170 | |
| 3171 | |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3172 |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3173 def test_incoming_movescu_accession(self): |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3174 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3175 |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
3176 # No matching patient, so no job is created |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3177 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3178 CallMoveScu([ '--study', '-k', '0008,0052=STUDY', '-k', 'AccessionNumber=nope' ]) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3179 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3180 CallMoveScu([ '--study', '-k', '0008,0052=PATIENT', '-k', 'AccessionNumber=A10003245599' ]) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3181 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
3182 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
3183 # 1 Matching patient, track the job |
| 138 | 3184 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
| 3185 '--study', | |
| 3186 '-k', '0008,0052=STUDY', | |
| 3187 '-k', 'AccessionNumber=A10003245599' | |
| 3188 ]))) | |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
3189 |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3190 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3191 |
| 55 | 3192 |
| 3193 def test_dicom_to_json(self): | |
| 3194 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
|
3195 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
|
3196 |
|
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
3197 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
|
3198 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
|
3199 self.assertTrue(CompareTags(t, json.loads(f.read()), [ |
| 123 | 3200 # Tags for compatibility with DCMTK 3.6.0 |
| 3201 'RETIRED_OtherPatientIDs', | |
| 3202 'OtherPatientIDs', | |
| 3203 'ACR_NEMA_2C_VariablePixelDataGroupLength', | |
|
80
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
3204 ])) |
| 55 | 3205 |
| 3206 t = DoGet(_REMOTE, '/instances/%s/tags' % i) | |
| 3207 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
|
3208 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
|
3209 ])) |
| 55 | 3210 |
|
60
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
3211 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
|
3212 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
|
3213 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
|
3214 ])) |
|
60
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
3215 |
|
372
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3216 |
|
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3217 # 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
|
3218 # following command: |
|
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3219 # $ 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
|
3220 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
|
3221 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
|
3222 a = json.loads(f.read()) |
|
378
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3223 |
|
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3224 # 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
|
3225 # 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
|
3226 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
|
3227 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
|
3228 self.assertFalse('7fe1,1001' in t) |
|
378
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3229 del a['7fe1,0010'] |
|
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3230 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
|
3231 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3232 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
|
3233 self.assertTrue('7fe1,1001' in t) |
|
378
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3234 |
|
65
09fc27e0899a
patch for testing windows builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
3235 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
|
3236 tt = (json.dumps(t) |
|
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3237 .replace('2e+022', '2e+22') |
|
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3238 # 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
|
3239 .replace('IllegalPrivatePixelSequence', 'Unknown Tag & Data')) |
|
65
09fc27e0899a
patch for testing windows builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
3240 self.assertEqual(aa, tt) |
| 57 | 3241 |
| 3242 | |
| 3243 def test_batch_archive(self): | |
| 3244 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 3245 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') | |
| 3246 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 3247 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0002.dcm') | |
| 3248 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 3249 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm') | |
| 3250 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 3251 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm') | |
| 3252 | |
| 3253 s = DoPost(_REMOTE, '/tools/create-archive', [ ]) | |
| 3254 z = zipfile.ZipFile(StringIO(s), "r") | |
| 3255 self.assertEqual(0, len(z.namelist())) | |
| 3256 | |
| 3257 # One patient | |
| 3258 s = DoPost(_REMOTE, '/tools/create-archive', [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ]) | |
| 3259 z = zipfile.ZipFile(StringIO(s), "r") | |
| 3260 self.assertEqual(4, len(z.namelist())) | |
| 3261 | |
| 3262 # One patient + twice its study + one series from other patient | |
| 3263 s = DoPost(_REMOTE, '/tools/create-archive', [ | |
| 3264 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17', | |
| 3265 '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918', | |
| 3266 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' | |
| 3267 ]) | |
| 3268 z = zipfile.ZipFile(StringIO(s), "r") | |
| 3269 self.assertEqual(6, len(z.namelist())) | |
| 3270 | |
| 3271 # One patient + one series + one instance | |
| 3272 s = DoPost(_REMOTE, '/tools/create-archive', [ | |
| 3273 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17', | |
| 3274 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0', | |
| 3275 '1d429ccb-bdcc78a1-7d129d6a-ba4966ed-fe4dbd87' | |
| 3276 ]) | |
| 3277 z = zipfile.ZipFile(StringIO(s), "r") | |
| 3278 self.assertEqual(7, len(z.namelist())) | |
|
59
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3279 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3280 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3281 def test_decode_brainix_as_jpeg(self): |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3282 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
|
3283 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3284 j = GetImage(_REMOTE, '/instances/%s/preview' % i) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3285 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3286 self.assertEqual(j.size[0], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3287 self.assertEqual(j.size[1], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3288 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3289 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
|
3290 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3291 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3292 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
|
3293 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3294 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3295 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
|
3296 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3297 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3298 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
|
3299 self.assertEqual('JPEG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3300 self.assertEqual(j.size[0], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3301 self.assertEqual(j.size[1], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3302 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3303 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
|
3304 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
|
3305 self.assertLess(a, b) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3306 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3307 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
|
3308 self.assertEqual('JPEG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3309 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3310 # 16bit encoding is not supported with JPEG |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3311 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
|
3312 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
|
3313 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3314 # No matching content type |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3315 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
|
3316 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3317 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3318 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3319 def test_media_encodings(self): |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3320 ascii = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3321 latin1 = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3322 latin2 = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3323 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3324 tmp = DoPost(_REMOTE, '/tools/create-media', [ascii,latin1,latin2]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3325 z = zipfile.ZipFile(StringIO(tmp), "r") |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3326 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3327 self.assertEqual(4, len(z.namelist())) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3328 self.assertTrue('IMAGES/IM0' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3329 self.assertTrue('IMAGES/IM1' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3330 self.assertTrue('IMAGES/IM2' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3331 self.assertTrue('DICOMDIR' in z.namelist()) |
|
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 try: |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3334 os.remove('/tmp/DICOMDIR') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3335 except: |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3336 # The file does not exist |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3337 pass |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3338 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3339 z.extract('DICOMDIR', '/tmp') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3340 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ], |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3341 stderr = subprocess.STDOUT).split('\n') |
|
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 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ], |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3344 stderr = subprocess.STDOUT).split('\n') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3345 self.assertEqual(1, len(a)) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3346 self.assertEqual('', a[0]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3347 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3348 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3349 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
|
3350 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
|
3351 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
|
3352 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3353 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
|
3354 |
|
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 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
|
3357 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
|
3358 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
|
3359 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
|
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', 'NumberOfPatientRelatedStudies' ]) |
|
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,1200\).*?\[(.*?)\]', 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('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
|
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=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
|
3367 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
|
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=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
|
3372 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
|
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=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
|
3377 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
|
3378 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
|
3379 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
|
3380 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3381 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
|
3382 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
|
3383 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
|
3384 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
|
3385 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3386 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
|
3387 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
|
3388 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
|
3389 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
|
3390 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
|
3391 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3392 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
|
3393 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
|
3394 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
|
3395 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
|
3396 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
|
3397 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
|
3398 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3399 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
|
3400 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
|
3401 self.assertEqual(1, len(s)) |
|
176
48cc188ffb09
strip trailing 0 char that appears with some findscu versions
am@osimis.io
parents:
175
diff
changeset
|
3402 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
|
3403 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
|
3404 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
|
3405 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3406 |
|
78
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3407 def test_decode_transfer_syntax(self): |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3408 def Check(t, md5): |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3409 i = UploadInstance(_REMOTE, 'TransferSyntaxes/%s.dcm' % t)['ID'] |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3410 |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
3411 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
|
3412 transferSyntax = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i) |
|
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
3413 self.assertEqual(t, transferSyntax) |
|
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
3414 |
|
78
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3415 if md5 == None: |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3416 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
|
3417 else: |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3418 m = ComputeMD5(DoGet(_REMOTE, '/instances/%s/preview' % i)) |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3419 self.assertEqual(m, md5) |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3420 |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3421 Check('1.2.840.10008.1.2.1', 'fae08d5415c4c0cd2cdbae4522408631') |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3422 Check('1.2.840.10008.1.2.2', 'f3d9784768b8feb54d6a50b6d5c37682') |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3423 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
|
3424 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
|
3425 Check('1.2.840.10008.1.2.4.70', '7132cfbc457305b04b59787030c785d2') |
| 384 | 3426 Check('1.2.840.10008.1.2.5', '6ff51ae525d362e0d04f550a64075a0e') # RLE, supported since Orthanc 1.0.1 |
| 3427 Check('1.2.840.10008.1.2', 'd54aed9f67a100984b42942cc2e9939b') | |
| 3428 | |
| 3429 # The 3 checks below don't work on big-endian | |
| 3430 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
|
3431 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
|
3432 Check('1.2.840.10008.1.2.4.81', '801579ae7cbf28e604ea74f2c99fa2ca') |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
3433 |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
3434 # JPEG2k image, not supported without GDCM plugin |
| 304 | 3435 if not HasGdcmPlugin(_REMOTE): |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
3436 Check('1.2.840.10008.1.2.4.90', None) |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
3437 Check('1.2.840.10008.1.2.4.91', None) |
| 79 | 3438 |
| 3439 | |
| 3440 def test_raw_frame(self): | |
| 3441 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] | |
| 3442 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 3443 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3444 self.assertEqual(512 * 512 * 2, len(a)) | |
| 3445 self.assertEqual(512 * 512 * 2, len(DoGet(_REMOTE, '/instances/%s/frames/23/raw' % s))) | |
| 3446 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/raw' % s)) | |
| 3447 self.assertEqual('1914287dc4d958eca21fdaacfb3482fa', ComputeMD5(a)) | |
| 3448 | |
| 3449 s = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] | |
| 3450 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 3451 self.assertEqual(186274, len(DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s))) | |
| 3452 self.assertEqual(189424, len(DoGet(_REMOTE, '/instances/%s/frames/75/raw' % s))) | |
| 3453 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/76/raw' % s)) | |
| 3454 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3455 self.assertEqual("L", im.mode) | |
| 3456 self.assertEqual(512, im.size[0]) | |
| 3457 self.assertEqual(512, im.size[1]) | |
| 3458 | |
| 3459 # Test an image with 2 JPEG frames spread over multiple fragments | |
| 3460 s = UploadInstance(_REMOTE, 'LenaTwiceWithFragments.dcm')['ID'] | |
| 3461 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 3462 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3463 b = DoGet(_REMOTE, '/instances/%s/frames/1/raw' % s) | |
| 3464 self.assertEqual(69214, len(a)) | |
| 3465 self.assertEqual(ComputeMD5(a), ComputeMD5(b)) | |
| 3466 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/2/raw' % s)) | |
| 3467 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3468 self.assertEqual("RGB", im.mode) | |
| 3469 self.assertEqual(512, im.size[0]) | |
| 3470 self.assertEqual(512, im.size[1]) | |
| 323 | 3471 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % s) # TODO - Doesn't work with GDCM 3.0.7 alone |
| 79 | 3472 self.assertEqual("RGB", im.mode) |
| 3473 self.assertEqual(512, im.size[0]) | |
| 3474 self.assertEqual(512, im.size[1]) | |
| 81 | 3475 |
| 3476 | |
| 3477 | |
| 3478 def test_rest_movescu(self): | |
| 3479 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 3480 | |
| 3481 # Upload 4 instances | |
| 3482 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 3483 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm') | |
| 3484 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 3485 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 3486 | |
| 3487 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 3488 for p in DoGet(_REMOTE, '/patients'): | |
| 3489 DoPost(_REMOTE, '/modalities/orthanctest/store', p) | |
| 3490 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 3491 | |
| 3492 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 3493 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3494 # Move instance Brainix/Flair/IM-0001-0001.dcm |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3495 DoPost(_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3496 'Level' : 'Instance', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3497 'Resources' : [ |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3498 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3499 '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
|
3500 '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
|
3501 '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
|
3502 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3503 ]}) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3504 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3505 # Move series Brainix/Flair/* |
| 81 | 3506 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
| 3507 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 3508 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 3509 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 3510 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3511 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3512 # Reset and test asynchronous C-Move at instance level |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3513 for p in DoGet(_REMOTE, '/patients'): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3514 DoDelete(_REMOTE, '/patients/%s' % p) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3515 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3516 DoPost(_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3517 'Level' : 'Instance', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3518 'Resources' : [ |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3519 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3520 '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
|
3521 '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
|
3522 '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
|
3523 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3524 ], |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3525 'Asynchronous': True |
|
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 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3529 (_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3530 'Level' : 'Instance', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3531 'Resources' : [ |
|
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 '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
|
3534 '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
|
3535 '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
|
3536 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3537 ], |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3538 'Asynchronous': True |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3539 })) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3540 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3541 self.assertNotEqual(None, job) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3542 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3543 # check the job was successfull |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3544 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3545 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3546 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3547 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3548 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3549 # check the job content |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3550 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content'] |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3551 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
|
3552 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
|
3553 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
|
3554 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3555 # Reset and test synchronous C-Move at series level |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3556 for p in DoGet(_REMOTE, '/patients'): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3557 DoDelete(_REMOTE, '/patients/%s' % p) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3558 |
| 81 | 3559 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series', |
| 3560 'Resources' : [ | |
| 3561 { | |
| 3562 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775', | |
| 3563 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', | |
| 3564 } | |
| 3565 ]}) | |
| 3566 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 3567 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 3568 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 3569 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) | |
| 3570 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3571 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3572 # 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
|
3573 for p in DoGet(_REMOTE, '/patients'): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3574 DoDelete(_REMOTE, '/patients/%s' % p) |
|
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 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3577 (_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3578 'Level' : 'Series', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3579 'Resources' : [ |
|
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 'PatientID' : '5Yp0E', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3582 '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
|
3583 '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
|
3584 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3585 ], |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3586 'Asynchronous': True |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3587 })) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3588 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3589 self.assertNotEqual(None, job) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3590 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3591 # check the job was successfull |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3592 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3593 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3594 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3595 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3596 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3597 # check the job content |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3598 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content'] |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3599 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
|
3600 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
|
3601 self.assertEqual('5Yp0E', jobContent['Query'][0]['0010,0020']) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3602 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3603 # Move series Brainix/Epi/* |
| 81 | 3604 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series', |
| 3605 'Resources' : [ | |
| 3606 { | |
| 3607 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775', | |
| 3608 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314125550', | |
| 3609 } | |
| 3610 ]}) | |
| 3611 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 3612 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 3613 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 3614 self.assertEqual(3, len(DoGet(_REMOTE, '/instances'))) | |
| 3615 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3616 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3617 # Move study Knee asynchronously |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3618 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3619 (_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3620 'Level' : 'Study', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3621 'Resources' : [ |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3622 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3623 '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
|
3624 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3625 ], |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3626 'Asynchronous': True |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3627 })) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3628 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3629 self.assertNotEqual(None, job) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3630 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3631 # check the job was successfull |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3632 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3633 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3634 self.assertEqual(3, len(DoGet(_REMOTE, '/series'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3635 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3636 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3637 # check the job content |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3638 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content'] |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3639 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', jobContent['Query'][0]['0020,000d']) |
| 81 | 3640 |
| 3641 # Reset | |
| 3642 for p in DoGet(_REMOTE, '/patients'): | |
| 3643 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 3644 | |
| 3645 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 3646 | |
| 3647 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3648 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3649 # Move all at once asynchronously at PatientLevel |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3650 job = MonitorJob2(_REMOTE, lambda: DoPost(_REMOTE, '/modalities/orthanctest/move', |
|
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 'Level' : 'Patient', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3653 'Resources' : [ |
|
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 'PatientID' : '5Yp0E', |
| 81 | 3656 }, |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3657 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3658 'PatientID': '887', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3659 'PatientName' : 'KNEE', |
| 81 | 3660 } |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3661 ], |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3662 'Synchronous': False |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3663 })) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3664 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3665 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3666 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3667 self.assertEqual(3, len(DoGet(_REMOTE, '/series'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3668 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) |
| 81 | 3669 |
|
86
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3670 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3671 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3672 def test_reconstruct_json(self): |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3673 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
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 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3676 first = DoGet(_REMOTE, '/instances/%s/tags' % 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 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
|
3679 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3680 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
|
3681 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
|
3682 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3683 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
|
3684 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3685 # Cannot delete the "DICOM" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3686 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
|
3687 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3688 # Can delete the "DICOM as JSON" attachment |
|
392
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
3689 if not IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
3690 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
|
3691 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
|
3692 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3693 # Only the "DICOM" attachment subsists |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3694 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance))) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3695 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3696 # Cannot manually reconstruct the "DICOM as JSON" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3697 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
|
3698 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3699 # Transparently reconstruct the "DICOM as JSON" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3700 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
|
3701 second = DoGet(_REMOTE, '/instances/%s/tags' % instance) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3702 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
|
3703 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3704 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
|
3705 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
|
3706 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3707 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
|
3708 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
|
3709 self.assertEqual(str(first), str(third)) |
|
87
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3710 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3711 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3712 def test_reconstruct_json2(self): |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3713 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3714 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3715 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
|
3716 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
|
3717 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3718 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
|
3719 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
|
3720 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3721 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
|
3722 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
|
3723 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3724 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
|
3725 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
|
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 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
|
3729 elif IsDicomUntilPixelDataStored(_REMOTE): |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3730 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
|
3731 self.assertEqual(aa, bb) |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3732 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
|
3733 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
|
3734 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3735 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
|
3736 self.assertEqual(aa, bb) |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3737 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
|
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 deletes "dicom-as-json" |
|
87
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3740 DoPost(_REMOTE, '/tools/invalidate-tags', '', 'text/plain') |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3741 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3742 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
|
3743 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
|
3744 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
|
3745 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3746 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
|
3747 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
|
3748 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3749 # 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
|
3750 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
|
3751 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
|
3752 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3753 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
|
3754 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
|
3755 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
|
3756 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3757 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
|
3758 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
|
3759 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3760 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3761 def test_private_tags(self): |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3762 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3763 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
|
3764 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
|
3765 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
|
3766 |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3767 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3768 def test_findscu_encoding(self): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3769 # Check out ../Database/Encodings/Generate.sh |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3770 TEST = u'Test-éüäöòДΘĝדصķћ๛ﾈİ' |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3771 ENCODINGS = { |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3772 'Arabic' : [ 'ISO_IR 127' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3773 'Ascii' : [ 'ISO_IR 6' ], # More accurately, ISO 646 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3774 'Cyrillic' : [ 'ISO_IR 144' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3775 'Greek' : [ 'ISO_IR 126' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3776 'Hebrew' : [ 'ISO_IR 138' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3777 'Japanese' : [ 'ISO_IR 13', 'shift-jis' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3778 'Latin1' : [ 'ISO_IR 100' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3779 'Latin2' : [ 'ISO_IR 101' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3780 'Latin3' : [ 'ISO_IR 109' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3781 'Latin4' : [ 'ISO_IR 110' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3782 'Latin5' : [ 'ISO_IR 148' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3783 'Thai' : [ 'ISO_IR 166', 'tis-620' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3784 'Utf8' : [ 'ISO_IR 192' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3785 } |
|
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 for name in ENCODINGS.iterkeys(): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3788 if len(ENCODINGS[name]) == 1: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3789 ENCODINGS[name].append(name.lower()) |
|
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 UploadInstance(_REMOTE, 'Encodings/Lena-utf8.dcm') |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3792 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3793 for name in ENCODINGS.iterkeys(): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3794 self.assertEqual(name, DoPut(_REMOTE, '/tools/default-encoding', name)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3795 self.assertEqual(name, DoGet(_REMOTE, '/tools/default-encoding')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3796 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3797 i = CallFindScu([ '-k', '0008,0052=STUDY', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3798 '-k', 'SpecificCharacterSet', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3799 '-k', 'PatientName' ]) |
|
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 characterSet = re.findall('\(0008,0005\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3802 self.assertEqual(1, len(characterSet)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3803 self.assertEqual(ENCODINGS[name][0], characterSet[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3804 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3805 patientName = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3806 self.assertEqual(1, len(patientName)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3807 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3808 expected = TEST.encode(ENCODINGS[name][1], 'ignore') |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3809 self.assertEqual(expected, patientName[0].strip()) |
|
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 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3812 #for master in ENCODINGS: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3813 for master in [ 'Latin1', 'Utf8', 'Cyrillic' ]: # Shortcut to speedup tests |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3814 self.assertEqual(master, DoPut(_REMOTE, '/tools/default-encoding', master)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3815 self.assertEqual(master, DoGet(_REMOTE, '/tools/default-encoding')) |
|
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 for name in ENCODINGS: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3818 DropOrthanc(_REMOTE) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3819 UploadInstance(_REMOTE, 'Encodings/Lena-%s.dcm' % ENCODINGS[name][1]) |
|
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 i = CallFindScu([ '-k', '0008,0052=STUDY', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3822 '-k', 'PatientID', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3823 '-k', 'SpecificCharacterSet', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3824 '-k', 'PatientName' ]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3825 i = i.decode(ENCODINGS[master][1]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3826 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3827 characterSet = re.findall('\(0008,0005\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3828 self.assertEqual(1, len(characterSet)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3829 self.assertEqual(ENCODINGS[master][0], characterSet[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3830 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3831 patientId = re.findall('\(0010,0020\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3832 self.assertEqual(1, len(patientId)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3833 self.assertEqual(ENCODINGS[name][1], patientId[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 patientName = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3836 self.assertEqual(1, len(patientName)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3837 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3838 tmp = ENCODINGS[name][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3839 expected = TEST.encode(tmp, 'ignore').decode(tmp) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3840 tmp = ENCODINGS[master][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3841 expected = expected.encode(tmp, 'ignore').decode(tmp) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3842 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3843 self.assertEqual(expected, patientName[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3844 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3845 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3846 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True, |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3847 'Level' : 'Study', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3848 'Query' : { }}) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3849 self.assertEqual(1, len(a)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3850 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3851 tmp = ENCODINGS[name][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3852 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
|
3853 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3854 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3855 def test_reconstruct(self): |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3856 def CompareMainDicomTag(expected, instance, level, tag): |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3857 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
|
3858 |
|
504
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3859 originalInstanceId = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
96
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3860 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3861 studies = DoGet(_REMOTE, '/studies/') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3862 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3863 self.assertEqual(1, len(studies)) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3864 self.assertEqual(1, len(DoGet(_REMOTE, '/series/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3865 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/'))) |
|
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 modified = DoPost(_REMOTE, '/studies/%s/modify' % studies[0], { |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3868 "Replace" : { |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3869 "StudyDescription" : "hello", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3870 "SeriesDescription" : "world", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3871 "SOPClassUID" : "test", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3872 "SOPInstanceUID" : "myid", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3873 }, |
| 119 | 3874 "Keep" : [ "StudyInstanceUID", "SeriesInstanceUID" ], |
| 3875 "Force" : True | |
|
96
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3876 }) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3877 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3878 instances = DoGet(_REMOTE, '/instances/') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3879 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3880 self.assertEqual(1, len(DoGet(_REMOTE, '/studies/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3881 self.assertEqual(1, len(DoGet(_REMOTE, '/series/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3882 self.assertEqual(2, len(instances)) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3883 |
|
504
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3884 modifiedInstanceId = instances[0] if instances[1] == originalInstanceId else instances[1] |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3885 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3886 # in 1.11.3, we have added an automatic reconstruction at the end of the modification |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3887 if not IsOrthancVersionAbove(_REMOTE, 1, 11, 3): |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3888 CompareMainDicomTag('Knee (R)', originalInstanceId, 'study', 'StudyDescription') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3889 CompareMainDicomTag('AX. FSE PD', originalInstanceId, 'series', 'SeriesDescription') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3890 CompareMainDicomTag('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', originalInstanceId, '', 'SOPInstanceUID') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3891 CompareMainDicomTag('myid', modifiedInstanceId, '', 'SOPInstanceUID') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3892 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % originalInstanceId).strip()) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3893 self.assertEqual('test', DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % modifiedInstanceId).strip()) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3894 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3895 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3896 # metadata before reconstruct |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3897 mba = DoGet(_REMOTE, '/instances/%s/metadata?expand' % originalInstanceId) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3898 mbb = DoGet(_REMOTE, '/instances/%s/metadata?expand' % originalInstanceId) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3899 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3900 # reconstruct by taking the new instance as the reference -> should repopulate study fields from this instance tags |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3901 DoPost(_REMOTE, '/instances/%s/reconstruct' % modifiedInstanceId, {}) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3902 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3903 CompareMainDicomTag('hello', originalInstanceId, 'study', 'StudyDescription') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3904 CompareMainDicomTag('world', originalInstanceId, 'series', 'SeriesDescription') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3905 CompareMainDicomTag('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', originalInstanceId, '', 'SOPInstanceUID') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3906 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3907 if not IsOrthancVersionAbove(_REMOTE, 1, 11, 3): |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3908 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3909 # metadata after reconstruct should have been preserved |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3910 maa = DoGet(_REMOTE, '/instances/%s/metadata?expand' % originalInstanceId) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3911 mab = DoGet(_REMOTE, '/instances/%s/metadata?expand' % originalInstanceId) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3912 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3913 self.assertEqual(mba, maa) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
3914 self.assertEqual(mbb, mab) |
|
473
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3915 |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
3916 |
|
503
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
3917 @unittest.skip("httpbin.org is down as of 2022-12-22") # TODO |
| 104 | 3918 def test_httpClient_lua(self): |
| 496 | 3919 retries = 4 |
|
463
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
3920 result = '' |
|
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
3921 |
| 104 | 3922 with open(GetDatabasePath('Lua/HttpClient.lua'), 'r') as f: |
| 496 | 3923 scriptContent = f.read() |
|
463
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
3924 # 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
|
3925 while retries > 0 and not ('OK' in result): |
| 496 | 3926 print("Executing lua script HttpClient.lua") |
| 3927 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
|
3928 retries -= 1 |
| 102 | 3929 |
| 3930 self.assertIn('OK', result) | |
|
107
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3931 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3932 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3933 def test_bitbucket_issue_44(self): |
| 319 | 3934 # 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
|
3935 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3936 UploadInstance(_REMOTE, 'Issue44/Monochrome2.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3937 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3938 # dcmcjpeg +ua +eb Monochrome1.dcm Monochrome1-Jpeg.dcm |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3939 UploadInstance(_REMOTE, 'Issue44/Monochrome1-Jpeg.dcm') |
|
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 # dcmcjpeg +ua Monochrome1.dcm Monochrome1-JpegLS.dcm |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3942 UploadInstance(_REMOTE, 'Issue44/Monochrome1-JpegLS.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3943 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3944 monochrome1 = 'bcdd600a-a6a9c522-5f0a6e84-8657c9f3-b76e59b7' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3945 monochrome1_jpeg = '9df82121-208a2da8-0038674a-3d7a773b-b7008cd2' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3946 monochrome1_jpegls = '0486d1a2-9165573f-b1976b20-e927b016-6b8d67ab' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3947 monochrome2 = 'f00947b7-f61f7164-c93414d1-c6fbda6a-9e92ed20' |
|
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 for i in [ monochrome1, monochrome1_jpeg, monochrome1_jpegls ]: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3950 im = GetImage(_REMOTE, '/instances/%s/preview' % i) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3951 self.assertEqual("L", im.mode) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3952 self.assertEqual(2010, im.size[0]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3953 self.assertEqual(2446, im.size[1]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3954 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3955 # 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
|
3956 # white (255), should be rendered as black (0) => invert |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3957 if i == monochrome1_jpeg: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3958 # Add some tolerance because of JPEG destructive compression |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3959 self.assertGreater(10, im.getpixel((0,0))) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3960 else: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3961 self.assertEqual(0, im.getpixel((0,0))) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3962 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3963 im = GetImage(_REMOTE, '/instances/%s/preview' % monochrome2) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3964 self.assertEqual("L", im.mode) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3965 self.assertEqual(1572, im.size[0]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3966 self.assertEqual(2010, im.size[1]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3967 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3968 # 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
|
3969 # white (255), should be rendered as white (255) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3970 self.assertEqual(255, im.getpixel((0,0))) |
|
111
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3971 |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3972 |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3973 def test_bitbucket_issue_42(self): |
| 319 | 3974 # https://bugs.orthanc-server.com/show_bug.cgi?id=42 |
| 123 | 3975 # 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
|
3976 UploadInstance(_REMOTE, 'Issue42.dcm')['ID'] |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3977 modified = DoPost(_REMOTE, |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3978 '/patients/da128605-e040d0c4-310615d2-3475da63-df2d1ef4/modify', |
| 119 | 3979 '{"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
|
3980 'application/json') |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3981 self.assertTrue('PatientID' in modified) |
|
113
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3982 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3983 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3984 def test_rest_find_limit(self): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3985 # Check the "Since" and "Limit" parameters in URI "/tools/find" |
| 319 | 3986 # 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
|
3987 |
|
113
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3988 # Upload 6 instances |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3989 brainix = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3990 knee = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3991 for i in range(2): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3992 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
|
3993 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
|
3994 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
|
3995 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3996 # Check using BRAINIX |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3997 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3998 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3999 'Limit' : 10 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4000 self.assertEqual(4, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4001 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4002 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4003 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4004 'Limit' : 4 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4005 self.assertEqual(4, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4006 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4007 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4008 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4009 'Since' : 2, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4010 'Limit' : 4 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4011 self.assertEqual(2, len(a)) |
|
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 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4014 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4015 'Limit' : 3 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4016 self.assertEqual(3, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4017 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4018 b = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4019 for i in range(4): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4020 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4021 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4022 'Limit' : 1, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4023 'Since' : i }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4024 self.assertEqual(1, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4025 b.append(a[0]) |
|
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 # 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
|
4028 self.assertEqual(0, len(set(b) ^ set(brainix))) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4029 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4030 # Check using KNEE |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4031 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4032 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4033 'Limit' : 10 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4034 self.assertEqual(2, len(a)) |
|
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 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4037 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4038 'Limit' : 2 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4039 self.assertEqual(2, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4040 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4041 b = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4042 for i in range(2): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4043 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4044 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4045 'Limit' : 1, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4046 'Since' : i }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4047 self.assertEqual(1, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4048 b.append(a[0]) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4049 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4050 self.assertEqual(0, len(set(b) ^ set(knee))) |
|
115
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 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4053 def test_bitbucket_issue_46(self): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4054 # "PHI remaining after anonymization" |
| 319 | 4055 # 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
|
4056 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4057 def GetAnonymizedTags(study, version): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4058 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4059 { 'DicomVersion' : version }, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4060 'application/json') ['ID'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4061 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4062 self.assertEqual(1, len(a)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4063 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4064 instance = a[0]['ID'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4065 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4066 return (instance, DoGet(_REMOTE, '/instances/%s/tags' % instance)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4067 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4068 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm') |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4069 origStudy = '6068a14b-d4df27af-9ec22145-538772d8-74f228ff' |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4070 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4071 # 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
|
4072 # (Patient's Mother's Birth Name) tags |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4073 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4074 '{"Replace":{"0010,1060":"OSIMIS","0032,1033":"MOTHER"}}', |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4075 'application/json')['ID'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4076 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4077 # 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
|
4078 # 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
|
4079 (instance, tags) = GetAnonymizedTags(newStudy, "2008") |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4080 self.assertTrue('0032,1033' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4081 self.assertTrue('0010,1060' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4082 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4083 # 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
|
4084 # 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
|
4085 (instance, tags) = GetAnonymizedTags(newStudy, "2017c") |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4086 self.assertFalse('0032,1033' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4087 self.assertFalse('0010,1060' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4088 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4089 t = {} |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4090 for (key, value) in tags.iteritems(): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4091 t[value['Name']] = value['Value'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4092 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4093 self.assertEqual('', t['StudyDate']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4094 self.assertEqual('', t['StudyTime']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4095 self.assertEqual('', t['PatientSex']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4096 self.assertFalse('SeriesDate' in t) # Type 3 tag => null |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4097 self.assertFalse('SeriesTime' in t) # Type 3 tag => null |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4098 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4099 with tempfile.NamedTemporaryFile(delete = True) as f: |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4100 # 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
|
4101 f.write(DoGet(_REMOTE, '/instances/%s/file' % instance)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4102 f.flush() |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4103 subprocess.check_output([ FindExecutable('dciodvfy'), f.name ], |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4104 stderr = subprocess.STDOUT).split('\n') |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4105 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4106 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4107 def test_bitbucket_issue_55(self): |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4108 def Run(modify, query): |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4109 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4110 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4111 operation = 'modify' if modify else 'anonymize' |
|
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 self.assertRaises(Exception, lambda: DoPost( |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4114 _REMOTE, '/studies/%s/%s' % (study, operation), query)) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4115 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
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 query["Force"] = True |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4118 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
|
4119 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4120 DoDelete(_REMOTE, a) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4121 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4122 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4123 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4124 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4125 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4126 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4127 Run(True, { "Replace" : { "StudyInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4128 Run(True, { "Replace" : { "SeriesInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4129 Run(True, { "Replace" : { "SOPInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4130 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4131 Run(False, { "Keep" : [ "StudyInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4132 Run(False, { "Keep" : [ "SeriesInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4133 Run(False, { "Keep" : [ "SOPInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4134 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4135 Run(False, { "Replace" : { "StudyInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4136 Run(False, { "Replace" : { "SeriesInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4137 Run(False, { "Replace" : { "SOPInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4138 |
|
120
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4139 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4140 def test_bitbucket_issue_56(self): |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4141 # Case-insensitive matching over accents. This test assumes |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4142 # that the "CaseSensitivePN" configuration option of Orthanc |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4143 # is set to "false" (default value). |
| 319 | 4144 # 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
|
4145 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4146 def Check(name, expected, expectedSensitive): |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4147 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
|
4148 '-k', '0008,0052=PATIENT', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4149 '-k', 'PatientName=%s' % name ]) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4150 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', a) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4151 self.assertEqual(expected, len(patientNames)) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4152 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4153 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4154 'CaseSensitive' : False, |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4155 'Query' : { 'PatientName' : name }}) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4156 self.assertEqual(expected, len(a)) |
|
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 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4159 'CaseSensitive' : True, |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4160 'Query' : { 'PatientName' : name }}) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4161 self.assertEqual(expectedSensitive, len(a)) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4162 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4163 UploadInstance(_REMOTE, 'Encodings/Lena-latin1.dcm') |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4164 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4165 # WildcardConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4166 Check('TeSt*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4167 Check('TeSt-a*', 0, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4168 Check('TeSt-É*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4169 Check('TeSt-é*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4170 Check('Test-é*', 1, 1) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4171 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4172 # ListConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4173 Check('Test-éüäöò\\nope', 1, 1) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4174 Check('Test-ÉÜÄÖÒ\\nope', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4175 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4176 # ValueConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4177 Check('Test-éüäöò', 1, 1) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4178 Check('Test-ÉÜÄÖÒ', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4179 |
| 125 | 4180 |
| 4181 def test_gbk_alias(self): | |
| 4182 # https://groups.google.com/d/msg/orthanc-users/WMM8LMbjpUc/02-1f_yFCgAJ | |
| 4183 # This test fails on Orthanc <= 1.3.0 | |
| 4184 i = UploadInstance(_REMOTE, '2017-09-19-GBK-Tumashu.dcm')['ID'] | |
| 4185 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) | |
| 4186 self.assertEqual(tags['PatientName'], u'徐浩凯') | |
| 4187 self.assertEqual(tags['InstitutionName'], u'灌云县疾病预防控制中心') | |
| 126 | 4188 |
| 4189 | |
| 4190 def test_long_tag(self): | |
| 4191 i = UploadInstance(_REMOTE, 'DummyCTWithLongTag.dcm')['ID'] | |
| 4192 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 4193 | |
| 4194 tags = DoGet(_REMOTE, '/instances/%s/tags' % i) | |
| 4195 self.assertTrue('0018,1020' in tags) | |
| 4196 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name']) | |
| 4197 self.assertEqual('TooLong', tags['0018,1020']['Type']) | |
| 4198 self.assertEqual(None, tags['0018,1020']['Value']) | |
| 4199 | |
| 4200 tags = DoGet(_REMOTE, '/instances/%s/tags?ignore-length=0018-1020' % i) | |
| 4201 self.assertTrue('0018,1020' in tags) | |
| 4202 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name']) | |
| 4203 self.assertEqual('String', tags['0018,1020']['Type']) | |
| 4204 self.assertTrue(tags['0018,1020']['Value'].startswith('Lorem ipsum dolor sit amet')) | |
| 4205 | |
| 4206 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) | |
| 4207 self.assertTrue('SoftwareVersions' in tags) | |
| 4208 self.assertEqual(None, tags['SoftwareVersions']) | |
| 4209 self.assertTrue('HeartRate' in tags) | |
| 4210 self.assertEqual(474, int(tags['HeartRate'])) | |
| 4211 | |
| 4212 tags = DoGet(_REMOTE, '/instances/%s/simplified-tags' % i) | |
| 4213 self.assertTrue('SoftwareVersions' in tags) | |
| 4214 self.assertEqual(None, tags['SoftwareVersions']) | |
| 4215 | |
| 4216 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify&ignore-length=0018-1020' % i) | |
| 4217 self.assertTrue('SoftwareVersions' in tags) | |
| 4218 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet')) | |
| 4219 | |
| 4220 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify&ignore-length=SoftwareVersions' % i) | |
| 4221 self.assertTrue('SoftwareVersions' in tags) | |
| 4222 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet')) | |
| 4223 | |
| 4224 tags = DoGet(_REMOTE, '/series/%s/instances-tags' % series) | |
| 4225 self.assertEqual(1, len(tags)) | |
| 4226 self.assertTrue(i in tags.keys()) | |
| 4227 self.assertTrue('0018,1020' in tags[i]) | |
| 4228 self.assertEqual('TooLong', tags[i]['0018,1020']['Type']) | |
| 4229 | |
| 4230 tags = DoGet(_REMOTE, '/series/%s/instances-tags?ignore-length=SoftwareVersions' % series) | |
| 4231 self.assertEqual(1, len(tags)) | |
| 4232 self.assertTrue(i in tags.keys()) | |
| 4233 self.assertTrue('0018,1020' in tags[i]) | |
| 4234 self.assertEqual('String', tags[i]['0018,1020']['Type']) | |
| 4235 self.assertTrue(tags[i]['0018,1020']['Value'].startswith('Lorem ipsum dolor sit amet')) | |
| 4236 | |
|
127
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 def test_extended_media(self): |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4239 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4240 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4241 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
|
4242 self.assertEqual(2, len(z.namelist())) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4243 self.assertTrue('IMAGES/IM0' in z.namelist()) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4244 self.assertTrue('DICOMDIR' in z.namelist()) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4245 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4246 try: |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4247 os.remove('/tmp/DICOMDIR') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4248 except: |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4249 # The file does not exist |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4250 pass |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4251 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4252 z.extract('DICOMDIR', '/tmp') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4253 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ], |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4254 stderr = subprocess.STDOUT).split('\n') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4255 self.assertEqual(5, len(a)) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4256 self.assertTrue(a[0].startswith('Warning')) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4257 self.assertEqual('BasicDirectory', a[1]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4258 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
|
4259 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
|
4260 self.assertEqual('', a[4]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4261 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4262 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ], |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4263 stderr = subprocess.STDOUT).split('\n') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4264 self.assertEqual(1, len(a)) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4265 self.assertEqual('', a[0]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4266 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4267 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4268 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
|
4269 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4270 # Check the presence of the series description (extended tag) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4271 self.assertTrue(re.search('T1W_aTSE', a) != None) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4272 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4273 os.remove('/tmp/DICOMDIR') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4274 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4275 |
|
132
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4276 def test_anonymize_relationships_1(self): |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4277 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4278 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
|
4279 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
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 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4282 '{}', |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4283 'application/json')['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4284 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4285 a = DoGet(_REMOTE, '/studies/%s/instances' % study) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4286 self.assertEqual(2, len(a)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4287 a1 = a[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4288 a2 = a[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4289 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4290 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4291 self.assertEqual(2, len(b)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4292 b1 = b[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4293 b2 = b[1]['ID'] |
|
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 SEQUENCE = '/instances/%s/content/ReferencedImageSequence' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4296 SOP = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPInstanceUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4297 CLASS = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPClassUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4298 FRAME = '/instances/%s/content/FrameOfReferenceUID' |
|
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 self.assertEqual(DoGet(_REMOTE, FRAME % a1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4301 DoGet(_REMOTE, FRAME % a2)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4302 self.assertEqual(DoGet(_REMOTE, FRAME % b1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4303 DoGet(_REMOTE, FRAME % b2)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4304 self.assertNotEqual(DoGet(_REMOTE, FRAME % a1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4305 DoGet(_REMOTE, FRAME % b1)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4306 self.assertNotEqual(DoGet(_REMOTE, FRAME % a2), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4307 DoGet(_REMOTE, FRAME % b2)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4308 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4309 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
|
4310 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
|
4311 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
|
4312 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
|
4313 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4314 for i in range(3): |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4315 self.assertEqual(DoGet(_REMOTE, SOP % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4316 DoGet(_REMOTE, SOP % (a2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4317 self.assertEqual(DoGet(_REMOTE, SOP % (b1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4318 DoGet(_REMOTE, SOP % (b2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4319 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4320 DoGet(_REMOTE, SOP % (b1, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4321 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4322 DoGet(_REMOTE, SOP % (b2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4323 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4324 DoGet(_REMOTE, CLASS % (b1, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4325 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4326 DoGet(_REMOTE, CLASS % (b2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4327 |
|
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 def test_anonymize_relationships_2(self): |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4330 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm') |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4331 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
|
4332 study = '6c65289b-db2fcb71-7eaf73f4-8e12470c-a4d6d7cf' |
|
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 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4335 '{}', |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4336 'application/json')['ID'] |
|
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 a = DoGet(_REMOTE, '/studies/%s/instances' % study) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4339 self.assertEqual(2, len(a)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4340 a1 = a[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4341 a2 = a[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4342 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4343 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4344 self.assertEqual(2, len(b)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4345 b1 = b[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4346 b2 = b[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4347 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4348 SEQUENCE = '/instances/%s/content/SourceImageSequence' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4349 SOP = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPInstanceUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4350 CLASS = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPClassUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4351 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4352 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
|
4353 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
|
4354 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
|
4355 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
|
4356 self.assertEqual(DoGet(_REMOTE, SOP % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4357 DoGet(_REMOTE, SOP % (a2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4358 self.assertEqual(DoGet(_REMOTE, SOP % (b1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4359 DoGet(_REMOTE, SOP % (b2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4360 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4361 DoGet(_REMOTE, SOP % (b1, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4362 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4363 DoGet(_REMOTE, SOP % (b2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4364 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4365 DoGet(_REMOTE, CLASS % (b1, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4366 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4367 DoGet(_REMOTE, CLASS % (b2, 0))) |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4368 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4369 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4370 def test_anonymize_relationships_3(self): |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4371 sr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM0')['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4372 mr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM631')['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4373 study = 'ef351eb2-c1147229-062736b8-35a151e3-e32d526b' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4374 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4375 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4376 { "Keep" : [ "ContentSequence" ] }) ['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4377 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4378 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4379 self.assertEqual(2, len(a)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4380 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4381 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
|
4382 sr2 = a[0]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4383 mr2 = a[1]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4384 else: |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4385 sr2 = a[1]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4386 mr2 = a[0]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4387 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4388 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % sr1), |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4389 DoGet(_REMOTE, '/instances/%s/content/Modality' % sr2)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4390 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % mr1), |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4391 DoGet(_REMOTE, '/instances/%s/content/Modality' % mr2)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4392 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4393 mrUid1 = DoGet(_REMOTE, '/instances/%s' % mr1)['MainDicomTags']['SOPInstanceUID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4394 mrUid2 = DoGet(_REMOTE, '/instances/%s' % mr2)['MainDicomTags']['SOPInstanceUID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4395 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
|
4396 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
|
4397 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
|
4398 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
|
4399 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4400 PATH1 = '/instances/%s/content/CurrentRequestedProcedureEvidenceSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4401 PATH2 = PATH1 + '/0/ReferencedSeriesSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4402 PATH3 = PATH2 + '/0/ReferencedSOPSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4403 PATH4 = PATH3 + '/0/ReferencedSOPInstanceUID' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4404 PATH5 = PATH3 + '/0/ReferencedSOPClassUID' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4405 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4406 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4407 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4408 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4409 self.assertEqual(DoGet(_REMOTE, PATH4 % sr1), mrUid1) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4410 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
|
4411 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
|
4412 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4413 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4414 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4415 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4416 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
|
4417 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4418 self.assertEqual(mrUid2, DoGet(_REMOTE, PATH4 % sr2).strip('\x00')) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4419 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
|
4420 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
|
4421 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4422 content1 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr1) ['ContentSequence'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4423 content2 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr2) ['ContentSequence'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4424 self.assertEqual(str(content1), str(content2)) |
|
141
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4425 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4426 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4427 def test_bitbucket_issue_94(self): |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4428 # "a simple instance modification should not modify FrameOfReferenceUID + ..." |
| 319 | 4429 # 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
|
4430 i = UploadInstance(_REMOTE, 'Issue94.dcm')['ID'] |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4431 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4432 source = DoGet(_REMOTE, '/instances/%s/attachments/dicom/data' % i) |
|
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 modified = DoPost(_REMOTE, '/instances/%s/modify' % i, |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4435 { "Replace" : {"PatientID" : "toto"}, "Force": True}) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4436 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4437 anonymized = DoPost(_REMOTE, '/instances/%s/anonymize' % i) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4438 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4439 a = ExtractDicomTags(source, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4440 self.assertEqual(1, len(a)) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4441 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4442 b = ExtractDicomTags(modified, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4443 self.assertEqual(1, len(b)) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4444 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4445 c = ExtractDicomTags(anonymized, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4446 self.assertEqual(1, len(c)) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4447 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4448 self.assertEqual(a, b) # Modified DICOM |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4449 self.assertNotEqual(a, c) # Anonymized DICOM |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4450 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4451 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4452 def test_metadata_origin(self): |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4453 # Upload using the REST API |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4454 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
|
4455 self.assertEqual('RestApi', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4456 self.assertEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4457 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4458 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/metadata/CalledAET' % i)) |
| 315 | 4459 |
| 4460 # "HttpUsername" is empty iff "AuthenticationEnabled" is "false" | |
| 4461 self.assertTrue(DoGet(_REMOTE, '/instances/%s/metadata/HttpUsername' % i) in [ '', 'alice' ]) | |
| 4462 | |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4463 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4464 self.assertEqual('RestApi', m['Origin']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4465 self.assertEqual('', m['RemoteAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4466 self.assertNotEqual('', m['RemoteIP']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4467 self.assertFalse('CalledAET' in m) |
| 315 | 4468 self.assertTrue('HttpUsername' in m) |
| 4469 self.assertTrue(m['HttpUsername'] in [ '', 'alice' ]) | |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4470 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4471 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
|
4472 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
|
4473 self.assertEqual('1', m['IndexInSeries']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4474 self.assertTrue('ReceptionDate' in m) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4475 |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4476 DoDelete(_REMOTE, '/instances/%s' % i) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4477 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4478 # Upload using the DICOM protocol |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4479 subprocess.check_call([ FindExecutable('storescu'), |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4480 _REMOTE['Server'], str(_REMOTE['DicomPort']), |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4481 GetDatabasePath('Knee/T1/IM-0001-0001.dcm'), |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4482 '-xw' ]) # Propose JPEG2000 |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4483 self.assertEqual('DicomProtocol', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4484 self.assertEqual('STORESCU', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4485 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4486 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
|
4487 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
|
4488 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4489 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4490 self.assertEqual('DicomProtocol', m['Origin']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4491 self.assertEqual('STORESCU', m['RemoteAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4492 self.assertNotEqual('', m['RemoteIP']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4493 self.assertEqual('ANY-SCP', m['CalledAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4494 self.assertFalse('HttpUsername' in m) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4495 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4496 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
|
4497 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
|
4498 self.assertEqual('1', m['IndexInSeries']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4499 self.assertTrue('ReceptionDate' in m) |
| 147 | 4500 |
| 4501 | |
| 4502 def test_lua_deadlock(self): | |
| 4503 # Rana Asim Wajid (2018-07-14): "It does seem that the issue | |
| 4504 # is with the lua script I'm using for conversion of images to | |
| 4505 # JPEG2000. When the script is used with 1.4.0 the first | |
| 4506 # instance appears to be stored and then everything just | |
| 4507 # halts, ie Orthanc wont respond to anything after that." | |
| 4508 # https://groups.google.com/d/msg/orthanc-users/Rc-Beb42xc8/JUgdzrmCAgAJ | |
| 174 | 4509 InstallLuaScriptFromPath(_REMOTE, 'Lua/Jpeg2000Conversion.lua') |
| 147 | 4510 |
| 4511 subprocess.check_call([ FindExecutable('storescu'), | |
| 4512 _REMOTE['Server'], str(_REMOTE['DicomPort']), | |
| 4513 GetDatabasePath('Brainix/Flair/IM-0001-0001.dcm'), | |
| 4514 GetDatabasePath('Brainix/Flair/IM-0001-0002.dcm'), | |
| 4515 ]) | |
| 4516 | |
| 4517 instances = DoGet(_REMOTE, '/instances') | |
| 4518 self.assertEqual(2, len(instances)) | |
| 4519 | |
| 4520 t1 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[0]) | |
| 4521 t2 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[1]) | |
| 175 | 4522 self.assertEqual('1.2.840.10008.1.2.4.90', t1) # this will fail if libgdcm-tools is not installed |
| 147 | 4523 self.assertEqual(t1, t2); |
|
154
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4524 |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4525 |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4526 def test_find_group_length(self): |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4527 # 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
|
4528 # one of the Generic Group Length tags (*, 0x0000) |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4529 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
|
4530 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
|
4531 self.assertFalse('UnableToProcess' in result) |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4532 self.assertFalse('E:' in result) |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4533 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4534 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4535 def test_split(self): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4536 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4537 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
|
4538 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
|
4539 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
|
4540 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4541 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4542 t2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' |
|
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 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4545 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
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 info = DoGet(_REMOTE, '/studies/%s' % study) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4548 self.assertTrue('ReferringPhysicianName' in info['MainDicomTags']) |
|
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 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4551 (_REMOTE, '/studies/%s/split' % study, { |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4552 'Series' : [ t2 ], |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4553 'Replace' : { 'PatientName' : 'Hello' }, |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4554 'Remove' : [ 'ReferringPhysicianName' ], |
| 181 | 4555 'KeepSource' : False, |
| 4556 'Asynchronous' : True | |
|
179
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 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4559 self.assertNotEqual(None, job) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4560 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4561 studies = set(DoGet(_REMOTE, '/studies')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4562 self.assertEqual(2, len(studies)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4563 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4564 series = set(DoGet(_REMOTE, '/series')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4565 self.assertEqual(2, len(series)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4566 self.assertTrue(t1 in series) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4567 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4568 study2 = DoGet(_REMOTE, '/jobs/%s' % job)['Content']['TargetStudy'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4569 self.assertTrue(study in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4570 self.assertTrue(study2 in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4571 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4572 info = DoGet(_REMOTE, '/studies/%s' % study2) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4573 self.assertTrue('Hello', info['PatientMainDicomTags']['PatientName']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4574 self.assertFalse('ReferringPhysicianName' in info['MainDicomTags']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4575 |
|
254
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4576 sopInstanceUids = set() |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4577 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
|
4578 sopInstanceUids.add(i['MainDicomTags']['SOPInstanceUID']) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4579 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4580 self.assertTrue(knee1Sop in sopInstanceUids) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4581 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4582 # Fails if Orthanc <= 1.5.7 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4583 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
|
4584 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4585 # 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
|
4586 self.assertEqual(2, len(sopInstanceUids)) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4587 |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4588 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4589 def test_merge(self): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4590 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
|
4591 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
|
4592 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
|
4593 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
|
4594 knee = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4595 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4596 brainix = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4597 flair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4598 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4599 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4600 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
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 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4603 (_REMOTE, '/studies/%s/merge' % knee, { |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4604 'Resources' : [ brainix ], |
| 181 | 4605 'KeepSource' : True, |
| 4606 'Synchronous' : False | |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4607 })) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4608 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4609 self.assertNotEqual(None, job) |
|
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 studies = set(DoGet(_REMOTE, '/studies')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4612 self.assertEqual(2, len(studies)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4613 self.assertTrue(knee in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4614 self.assertTrue(brainix in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4615 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4616 series = set(DoGet(_REMOTE, '/studies/%s' % knee)['Series']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4617 self.assertTrue(t1 in series) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4618 series.remove(t1) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4619 self.assertEqual(1, len(series)) |
|
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 instances = DoGet(_REMOTE, '/series/%s' % list(series)[0])['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4622 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4623 merged = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4624 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4625 instances = DoGet(_REMOTE, '/series/%s' % t1)['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4626 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4627 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4628 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4629 instances = DoGet(_REMOTE, '/series/%s' % flair)['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4630 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4631 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4632 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4633 tags = DoGet(_REMOTE, '/studies/%s' % knee) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4634 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4635 for key in tags['PatientMainDicomTags']: |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4636 self.assertEqual(a[key], merged[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4637 if (key in b and key != 'PatientSex'): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4638 self.assertNotEqual(a[key], b[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4639 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4640 for key in tags['MainDicomTags']: |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4641 # Not in the patient/study module |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4642 if (not key in [ 'InstitutionName', |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4643 'RequestingPhysician', |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4644 'RequestedProcedureDescription', ]): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4645 self.assertEqual(a[key], merged[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4646 if (key in b): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4647 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
|
4648 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4649 sopInstanceUids = set() |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4650 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
|
4651 sopInstanceUids.add(i['MainDicomTags']['SOPInstanceUID']) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4652 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4653 self.assertTrue(kneeSop in sopInstanceUids) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4654 self.assertTrue(brainixSop in sopInstanceUids) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4655 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4656 # Fails if Orthanc <= 1.5.7 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4657 # 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
|
4658 self.assertEqual(3, len(sopInstanceUids)) |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4659 |
| 187 | 4660 |
| 4661 def test_async_archive(self): | |
| 4662 # Testing the asynchronous generation of archives/medias (new | |
| 4663 # in Orthanc 1.4.3) | |
| 4664 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 4665 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 4666 | |
| 4667 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' | |
| 4668 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' | |
| 4669 | |
| 4670 job = MonitorJob2(_REMOTE, lambda: DoPost | |
| 508 | 4671 (_REMOTE, '/series/%s/archive' % kneeT1, { |
| 187 | 4672 'Synchronous' : False |
| 4673 })) | |
| 4674 | |
| 4675 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) | |
| 4676 self.assertEqual(1, len(z.namelist())) | |
| 4677 self.assertFalse('DICOMDIR' in z.namelist()) | |
| 4678 | |
|
354
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4679 info = DoGet(_REMOTE, '/jobs/%s' % job) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4680 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
|
4681 self.assertEqual(1, info['Content']['InstancesCount']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4682 self.assertEqual(0, info['Content']['UncompressedSizeMB']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4683 |
| 187 | 4684 job2 = MonitorJob2(_REMOTE, lambda: DoPost |
| 508 | 4685 (_REMOTE, '/series/%s/media' % kneeT1, { |
| 187 | 4686 'Synchronous' : False |
| 4687 })) | |
| 4688 | |
| 4689 # The archive from the first job has been replaced by the | |
| 4690 # archive from second job (as MediaArchiveSize == 1) | |
| 4691 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job)) | |
| 4692 | |
| 4693 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job2) | |
| 4694 self.assertEqual(2, len(z.namelist())) | |
| 4695 self.assertTrue('DICOMDIR' in z.namelist()) | |
| 4696 | |
|
354
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4697 info = DoGet(_REMOTE, '/jobs/%s' % job2) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4698 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
|
4699 self.assertEqual(1, info['Content']['InstancesCount']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4700 self.assertEqual(0, info['Content']['UncompressedSizeMB']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4701 |
| 187 | 4702 job = MonitorJob2(_REMOTE, lambda: DoPost |
| 4703 (_REMOTE, '/tools/create-archive', { | |
| 4704 'Synchronous' : False, | |
| 4705 'Resources' : [ kneeT1, kneeT2 ], | |
| 4706 })) | |
| 4707 | |
| 4708 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) | |
| 4709 self.assertEqual(2, len(z.namelist())) | |
| 4710 self.assertFalse('DICOMDIR' in z.namelist()) | |
| 4711 | |
|
354
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4712 info = DoGet(_REMOTE, '/jobs/%s' % job) |
|
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 job = MonitorJob2(_REMOTE, lambda: DoPost |
| 4718 (_REMOTE, '/tools/create-media', { | |
| 4719 'Synchronous' : False, | |
| 4720 'Resources' : [ kneeT1, kneeT2 ], | |
| 4721 })) | |
| 4722 | |
| 4723 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) | |
| 4724 self.assertEqual(3, len(z.namelist())) | |
| 4725 self.assertTrue('DICOMDIR' in z.namelist()) | |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4726 |
|
354
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4727 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
|
4728 self.assertEqual(2, info['Content']['InstancesCount']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4729 self.assertEqual(0, info['Content']['UncompressedSizeMB']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
4730 |
| 187 | 4731 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4732 def test_queries_hierarchy(self): |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4733 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4734 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
|
4735 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4736 tags = { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4737 'NumberOfPatientRelatedInstances' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4738 'NumberOfPatientRelatedSeries' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4739 'NumberOfPatientRelatedStudies' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4740 'NumberOfStudyRelatedInstances' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4741 'NumberOfStudyRelatedSeries' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4742 'NumberOfSeriesRelatedInstances' : '', |
|
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 |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4745 tags2 = copy.copy(tags) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4746 tags2['PatientID'] = '887' # Only consider the "Knee" patient |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4747 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4748 patient = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4749 'Level' : 'Patient', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4750 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4751 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4752 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4753 study = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4754 'Level' : 'Study', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4755 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4756 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4757 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4758 series = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4759 'Level' : 'Series', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4760 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4761 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4762 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4763 instance = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4764 'Level' : 'Instance', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4765 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4766 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4767 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4768 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
|
4769 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4770 self.assertEqual('887', p[0]['PatientID']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4771 self.assertEqual('1', p[0]['NumberOfPatientRelatedInstances']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4772 self.assertEqual('1', p[0]['NumberOfPatientRelatedSeries']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4773 self.assertEqual('1', p[0]['NumberOfPatientRelatedStudies']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4774 self.assertFalse('NumberOfStudyRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4775 self.assertFalse('NumberOfStudyRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4776 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4777 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4778 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
|
4779 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4780 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
|
4781 self.assertEqual('1', p[0]['NumberOfStudyRelatedInstances']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4782 self.assertEqual('1', p[0]['NumberOfStudyRelatedSeries']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4783 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4784 self.assertFalse('NumberOfPatientRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4785 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4786 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0]) |
|
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 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
|
4789 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4790 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
|
4791 self.assertEqual('1', p[0]['NumberOfSeriesRelatedInstances']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4792 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4793 self.assertFalse('NumberOfPatientRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4794 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4795 self.assertFalse('NumberOfStudyRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4796 self.assertFalse('NumberOfStudyRelatedSeries' in p[0]) |
|
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 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
|
4799 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4800 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
|
4801 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4802 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
|
4803 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4804 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
|
4805 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % study)) |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4806 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4807 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
|
4808 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4809 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
|
4810 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4811 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4812 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
|
4813 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4814 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
|
4815 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4816 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4817 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
|
4818 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4819 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
|
4820 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4821 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4822 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
|
4823 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4824 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
|
4825 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4826 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4827 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
|
4828 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4829 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
|
4830 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4831 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4832 |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4833 def test_dicom_disk_size(self): |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4834 dicomSize = 0 |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4835 |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4836 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
|
4837 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
|
4838 |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4839 for i in range(2): |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4840 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
|
4841 UploadInstance(_REMOTE, p) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4842 dicomSize += os.path.getsize(GetDatabasePath(p)) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4843 |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4844 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
|
4845 self.assertEqual(2, s['CountInstances']) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4846 self.assertEqual(2, s['CountSeries']) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4847 self.assertEqual(1, s['CountStudies']) |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4848 |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4849 self.assertEqual(dicomSize, int(s['DicomUncompressedSize'])) |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4850 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4851 if isCompressed: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4852 self.assertGreater(dicomSize, int(s['DicomDiskSize'])) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4853 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
|
4854 self.assertLess(dicomSize, int(s['UncompressedSize'])) |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4855 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4856 self.assertEqual(dicomSize, int(s['DicomDiskSize'])) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
4857 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
|
4858 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
|
4859 if IsDicomUntilPixelDataStored(_REMOTE): |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4860 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
|
4861 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4862 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
|
4863 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4864 # 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
|
4865 # 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
|
4866 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
|
4867 |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4868 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4869 def test_changes_2(self): |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4870 # 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
|
4871 # 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
|
4872 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4873 # 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
|
4874 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
|
4875 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
|
4876 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
|
4877 DoDelete(_REMOTE, '/instances/%s' % a) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4878 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4879 # 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
|
4880 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
|
4881 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4882 c = DoGet(_REMOTE, '/changes') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4883 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
|
4884 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4885 seq = c['Last'] |
|
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?last') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4888 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
|
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, 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?since=%d' % (seq + 1000)) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4893 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
|
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, 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 # Add one instance |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4898 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4899 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
|
4900 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4901 c = DoGet(_REMOTE, '/changes') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4902 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
|
4903 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4904 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
|
4905 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4906 c = DoGet(_REMOTE, '/changes?last') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4907 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
|
4908 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4909 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
|
4910 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4911 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
|
4912 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
|
4913 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4914 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
|
4915 |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4916 # 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
|
4917 # changes of type "UpdatedMetadata" |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4918 i = DoGet(_REMOTE, '/instances') [0] |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4919 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
|
4920 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
4921 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/4000' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
4922 self.assertEqual('200', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
4923 self.assertEqual('hello', body) |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4924 |
|
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 + 5, 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 |
|
394
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4931 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2): |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4932 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i, headers = { |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4933 'If-Match' : headers['etag'] |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4934 }) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4935 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4936 self.assertFalse('etag' in headers) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4937 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
4938 |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4939 c = DoGet(_REMOTE, '/changes?last') |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4940 self.assertEqual(1, len(c['Changes'])) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4941 self.assertTrue(c['Done']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4942 self.assertEqual(seq + 6, c['Last']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4943 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4944 |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4945 # Remove the uploaded instance |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4946 DoDelete(_REMOTE, '/instances/%s' % a) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4947 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
|
4948 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4949 c = DoGet(_REMOTE, '/changes') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4950 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
|
4951 self.assertTrue(c['Done']) |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4952 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
|
4953 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4954 c = DoGet(_REMOTE, '/changes?last') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4955 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
|
4956 self.assertTrue(c['Done']) |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4957 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
|
4958 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4959 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
|
4960 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
|
4961 self.assertTrue(c['Done']) |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
4962 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
|
4963 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4964 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4965 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
|
4966 a = UploadInstance(_REMOTE, 'Issue124.dcm')['ID'] |
| 508 | 4967 s = DoGet(_REMOTE, '/instances/%s/series' % a)['ID'] |
| 4968 | |
| 4969 z = GetArchive(_REMOTE, '/series/%s/media' % s) | |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4970 self.assertEqual(2, len(z.namelist())) |
|
207
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4971 |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4972 |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4973 def test_invalid_findscp(self): |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4974 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4975 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
|
4976 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
|
4977 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4978 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4979 def test_bitbucket_issue_90(self): |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4980 def CountDicomResults(sex): |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4981 a = CallFindScu([ '-S', '-k', '8,52=STUDY', '-k', sex ]) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4982 return len(re.findall('\(0010,0040\)', a)) |
|
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 def CountRestResults(sex): |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4985 a = DoPost(_REMOTE, '/tools/find', |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4986 { 'Level' : 'Study', 'Query' : { 'PatientSex' : sex } }) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4987 return len(a) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4988 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4989 # 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
|
4990 # "DummyCT.dcm" has the tag PatientSex (0010,0040) unset |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4991 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4992 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4993 # 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
|
4994 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4995 # 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
|
4996 self.assertEqual(0, CountDicomResults('PatientSex=*')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4997 self.assertEqual(0, CountRestResults('*')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4998 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4999 # 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
|
5000 self.assertEqual(0, CountDicomResults('PatientSex=F')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5001 self.assertEqual(0, CountDicomResults('PatientSex=M')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5002 self.assertEqual(0, CountRestResults('F')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5003 self.assertEqual(0, CountRestResults('M')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5004 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5005 # 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
|
5006 # 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
|
5007 # as a filter in such a situation. |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5008 self.assertEqual(1, CountDicomResults('PatientSex')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5009 self.assertEqual(1, CountDicomResults('PatientSex=')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5010 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
|
5011 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5012 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5013 def test_rest_modalities_in_study(self): |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5014 # 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
|
5015 # 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
|
5016 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5017 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5018 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5019 'Query' : { 'ModalitiesInStudy' : 'US' }}) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5020 self.assertEqual(0, len(a)) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5021 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5022 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5023 'Query' : { 'ModalitiesInStudy' : 'US\\CT' }}) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5024 self.assertEqual(1, len(a)) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5025 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5026 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5027 'Query' : { 'ModalitiesInStudy' : 'CT' }}) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5028 self.assertEqual(1, len(a)) |
| 211 | 5029 |
| 5030 | |
| 5031 def test_series_status(self): | |
| 5032 def HasCompletedInChanges(): | |
| 5033 for c in DoGet(_REMOTE, '/changes?limit=1000&since=0')['Changes']: | |
| 5034 if c['ChangeType'] == 'CompletedSeries': | |
| 5035 return True; | |
| 5036 | |
| 5037 return False | |
| 5038 | |
| 5039 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm') | |
| 5040 series = '8ea120d7-5057d919-837dfbcc-ccd04e0f-7f3a94aa' | |
| 5041 self.assertEqual('Unknown', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 5042 self.assertFalse(HasCompletedInChanges()) | |
| 5043 | |
| 5044 series = 'ce25ecb6-ed79d004-5ae43ca7-3fc89bc5-67511614' | |
| 5045 | |
| 5046 for i in range(3): | |
| 5047 UploadInstance(_REMOTE, 'Series/Lena-%d.dcm' % (i + 1)) | |
| 5048 self.assertEqual('Missing', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 5049 self.assertFalse(HasCompletedInChanges()) | |
| 5050 | |
| 5051 UploadInstance(_REMOTE, 'Series/Lena-4.dcm') | |
| 5052 self.assertEqual('Complete', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 5053 self.assertTrue(HasCompletedInChanges()) | |
| 5054 | |
| 5055 DoDelete(_REMOTE, '/changes') | |
| 5056 self.assertFalse(HasCompletedInChanges()) | |
| 5057 | |
| 5058 UploadInstance(_REMOTE, 'Series/Lena-5.dcm') | |
| 5059 self.assertEqual('Inconsistent', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 5060 self.assertFalse(HasCompletedInChanges()) | |
| 5061 | |
| 215 | 5062 |
| 5063 def test_dicomweb(self): | |
| 5064 def Compare(dicom, reference): | |
| 5065 a = UploadInstance(_REMOTE, dicom) ['ID'] | |
| 5066 b = DoGet(_REMOTE, '/instances/%s/file' % a, | |
| 5067 headers = { 'Accept' : 'application/dicom+json' }) | |
| 5068 with open(GetDatabasePath(reference), 'rb') as c: | |
| 5069 d = json.load(c) | |
| 220 | 5070 AssertAlmostEqualRecursive(self, d, b) |
| 215 | 5071 |
| 5072 Compare('DummyCT.dcm', 'DummyCT.json') | |
| 5073 Compare('MarekLatin2.dcm', 'MarekLatin2.json') | |
| 5074 Compare('HierarchicalAnonymization/StructuredReports/IM0', | |
| 5075 'HierarchicalAnonymization/StructuredReports/IM0.json') | |
| 217 | 5076 |
| 5077 | |
| 5078 def test_issue_95_encodings(self): | |
| 319 | 5079 # https://bugs.orthanc-server.com/show_bug.cgi?id=95 |
| 217 | 5080 # Check out image: "../Database/Encodings/DavidClunie/charsettests.screenshot.png" |
| 5081 | |
| 5082 # Very useful tool: "file2" from package "file-kanji" | |
| 5083 | |
| 5084 def GetPatientName(dicom): | |
| 5085 i = UploadInstance(_REMOTE, dicom) ['ID'] | |
| 5086 j = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) | |
| 5087 return j['PatientName'] | |
| 5088 | |
| 5089 def ComparePatientName(name, dicom): | |
| 5090 self.assertEqual(name, GetPatientName(dicom)) | |
| 5091 | |
| 5092 # gdcmraw -t 10,10 -i SCSFREN -o /tmp/tag && uconv -f ISO-IR-100 -t UTF-8 /tmp/tag && echo | |
| 5093 ComparePatientName(u'Buc^Jérôme', 'Encodings/DavidClunie/SCSFREN') | |
| 5094 | |
| 5095 # gdcmraw -t 10,10 -i SCSI2 -o /tmp/tag && uconv -f KOREAN -t UTF-8 /tmp/tag && echo | |
| 5096 ComparePatientName(u'Hong^Gildong=洪^吉洞=홍^길동', 'Encodings/DavidClunie/SCSI2') # Since Orthanc 1.5.5 | |
| 5097 | |
| 5098 # gdcmraw -t 10,10 -i SCSX2 -o /tmp/tag && uconv -f GB18030 -t UTF-8 /tmp/tag && echo | |
| 5099 ComparePatientName(u'Wang^XiaoDong=王^小东=', 'Encodings/DavidClunie/SCSX2') | |
| 5100 | |
| 5101 # gdcmraw -t 10,10 -i SCSX1 -o /tmp/tag && cat /tmp/tag && echo | |
| 5102 ComparePatientName(u'Wang^XiaoDong=王^小東=', 'Encodings/DavidClunie/SCSX1') | |
| 5103 | |
| 5104 # gdcmraw -t 10,10 -i SCSH31 -o /tmp/tag && uconv -f JIS -t UTF-8 /tmp/tag && echo | |
| 5105 ComparePatientName(u'Yamada^Tarou=山田^太郎=やまだ^たろう', 'Encodings/DavidClunie/SCSH31') | |
| 5106 | |
| 5107 # gdcmraw -t 10,10 -i SCSGERM -o /tmp/tag && uconv -f ISO-IR-100 -t UTF-8 /tmp/tag && echo | |
| 5108 ComparePatientName(u'Äneas^Rüdiger', 'Encodings/DavidClunie/SCSGERM') | |
| 5109 | |
| 5110 # gdcmraw -t 10,10 -i SCSGREEK -o /tmp/tag && uconv -f ISO-IR-126 -t UTF-8 /tmp/tag && echo | |
| 5111 ComparePatientName(u'Διονυσιος', 'Encodings/DavidClunie/SCSGREEK') | |
| 5112 | |
| 5113 # gdcmraw -t 10,10 -i SCSRUSS -o /tmp/tag && uconv -f ISO-IR-144 -t UTF-8 /tmp/tag && echo | |
| 5114 ComparePatientName(u'Люкceмбypг', 'Encodings/DavidClunie/SCSRUSS') | |
| 5115 | |
| 5116 # gdcmraw -t 10,10 -i SCSHBRW -o /tmp/tag && uconv -f ISO-IR-138 -t UTF-8 /tmp/tag && echo | |
| 5117 # NB: Hebrew is a right-to-left encoding, copying/pasting from | |
| 5118 # Linux console into Emacs automatically reverse the string | |
| 5119 ComparePatientName(u'שרון^דבורה', 'Encodings/DavidClunie/SCSHBRW') | |
| 5120 | |
| 5121 # gdcmraw -t 10,10 -i SCSARAB -o /tmp/tag && uconv -f ISO-IR-127 -t UTF-8 /tmp/tag && echo | |
| 5122 # NB: Right-to-left as for Hebrew (SCSHBRW), and the Ubuntu console can't display such | |
| 5123 # characters by default, but copy/paste works with Emacs | |
| 5124 ComparePatientName(u'قباني^لنزار', 'Encodings/DavidClunie/SCSARAB') | |
| 5125 | |
| 5126 # SCSH32: This SpecificCharacterSet is composed of 2 | |
| 5127 # codepages: "ISO 2022 IR 13" (i.e. "SHIFT_JIS") until the | |
| 5128 # first equal, then "ISO 2022 IR 87" (i.e. "JIS") for the | |
| 5129 # remainer. Orthanc only takes into consideration the first | |
| 5130 # codepage: This is a limitation. | |
| 5131 # gdcmraw -t 10,10 -i SCSH32 -o /tmp/tag && cut -d '=' -f 1 /tmp/tag | uconv -f SHIFT_JIS -t UTF-8 | |
| 5132 self.assertTrue(GetPatientName('Encodings/DavidClunie/SCSH32').startswith(u'ﾔﾏﾀﾞ^ﾀﾛｳ=')) | |
|
218
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5133 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5134 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5135 def test_findscu_missing_tags(self): |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5136 # dcmodify -e Rows DummyCTInvalidRows.dcm -gst -gse -gin |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5137 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5138 UploadInstance(_REMOTE, 'DummyCTInvalidRows.dcm') |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5139 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5140 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
|
5141 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5142 # We have 2 instances... |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5143 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5144 self.assertEqual(2, len(patientNames)) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5145 self.assertEqual('KNIX', patientNames[0]) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5146 self.assertEqual('KNIX', patientNames[1]) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5147 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5148 # ...but only 1 value for the "Rows" tag |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5149 rows = re.findall('\(0028,0010\) US ([0-9]+)', i) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5150 self.assertEqual(1, len(rows)) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5151 self.assertEqual('512', rows[0]) |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5152 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5153 |
|
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 def test_bitbucket_issue_131(self): |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5156 # "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
|
5157 # StudyInstanceUID in it's database." |
| 319 | 5158 # 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
|
5159 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5160 # Insert 2 instances, with the same StudyInstanceUID, but with |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5161 # different patient IDs. Orthanc will create 2 distincts |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5162 # patients, and the hierarchy of resources above the two |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5163 # instances will be fully disjoint. |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5164 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-a.dcm') |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5165 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-b.dcm') |
|
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 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5168 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5169 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5170 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5171 'Level' : 'Study', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5172 'Query' : {"PatientID": "A" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5173 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5174 # 1 study is matched |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5175 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
|
5176 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5177 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 5178 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 5179 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 5180 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5181 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5182 # 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
|
5183 # 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
|
5184 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5185 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5186 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5187 # Match the 2 studies |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5188 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5189 'Level' : 'Study', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5190 'Query' : {"StudyInstanceUID": "2.25.123" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5191 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
|
5192 DropOrthanc(_LOCAL) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5193 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 5194 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 5195 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 5196 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5197 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5198 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5199 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5200 # 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
|
5201 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5202 'Level' : 'Patient', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5203 'Query' : {"PatientID": "A" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5204 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
|
5205 DropOrthanc(_LOCAL) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5206 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 5207 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 5208 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 5209 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5210 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5211 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5212 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5213 # 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
|
5214 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5215 'Level' : 'Series', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5216 'Query' : {"PatientID": "A" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5217 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
|
5218 DropOrthanc(_LOCAL) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5219 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 5220 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 5221 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 5222 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5223 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5224 |
|
233
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5225 |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5226 def test_bitbucket_issue_136(self): |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5227 UploadInstance(_REMOTE, 'Issue137.dcm') |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5228 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
|
5229 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5230 self.assertEqual(1, len(patientNames)) |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5231 self.assertEqual('John Doe', patientNames[0]) |
|
234
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5232 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5233 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5234 def test_anonymize_relationships_4(self): |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5235 # 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
|
5236 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
|
5237 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
|
5238 study = '0c923249-d52121a9-2b7167f7-6b85534f-0943697e' |
|
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 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, '{}', |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5241 'application/json')['ID'] |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5242 series = DoGet(_REMOTE, '/studies/%s/series' % anonymized) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5243 self.assertEqual(2, len(series)) |
|
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 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
|
5246 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
|
5247 self.assertEqual(1, len(cr)) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5248 self.assertEqual(1, len(pr)) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5249 self.assertEqual(1, len(cr[0]['Instances'])) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5250 self.assertEqual(1, len(pr[0]['Instances'])) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5251 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5252 crinstance = DoGet(_REMOTE, '/instances/%s' % cr[0]['Instances'][0]) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5253 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
|
5254 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5255 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
|
5256 crinstance['MainDicomTags']['SOPInstanceUID']) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5257 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
|
5258 '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
|
5259 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5260 # This fails on Orthanc <= 1.5.6 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5261 self.assertEqual(tags['0008,1115'][0]['0020,000e'], |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5262 cr[0]['MainDicomTags']['SeriesInstanceUID']) |
|
235
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5263 |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5264 |
|
255
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5265 def test_anonymize_relationships_5(self): |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5266 ct1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/CT01.dcm') |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5267 rt1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/RT.dcm') |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5268 oStudyId = ct1['ParentStudy'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5269 oCtInstanceId = ct1['ID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5270 oRtInstanceId = rt1['ID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5271 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5272 oCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oCtInstanceId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5273 oRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oRtInstanceId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5274 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5275 # first validate the relationships in the source data |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5276 oStudyUID = oCtTags['StudyInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5277 oRtSeriesUID = oRtTags['SeriesInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5278 oRtInstanceUID = oRtTags['SOPInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5279 oRtFrameOfReferenceUID = oRtTags['ReferencedFrameOfReferenceSequence'][0]['FrameOfReferenceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5280 oCtSeriesUID = oCtTags['SeriesInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5281 oCtInstanceUID = oCtTags['SOPInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5282 oCtFrameOfReferenceUID = oCtTags['FrameOfReferenceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5283 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5284 oContourSequenceCount = len(oRtTags['ROIContourSequence'][0]['ContourSequence']) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5285 self.assertEqual(oCtFrameOfReferenceUID, oRtFrameOfReferenceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5286 self.assertEqual(oStudyUID, oRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID']) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5287 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
|
5288 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
|
5289 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
|
5290 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5291 ### anonymize |
|
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 aStudyId = DoPost(_REMOTE, '/studies/%s/anonymize' % oStudyId, '{}', |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5294 'application/json')['ID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5295 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5296 ### validate |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5297 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5298 aSeries = DoGet(_REMOTE, '/studies/%s/series' % aStudyId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5299 self.assertEqual(2, len(aSeries)) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5300 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5301 aCt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CT', aSeries)) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5302 aRt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'RTSTRUCT', aSeries)) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5303 aCtInstanceId = aCt[0]['Instances'][0] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5304 aRtInstanceId = aRt[0]['Instances'][0] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5305 aCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aCtInstanceId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5306 aRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aRtInstanceId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5307 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5308 # now validate the relationships in the anonymized data |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5309 aStudyUID = aCtTags['StudyInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5310 aRtSeriesUID = aRtTags['SeriesInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5311 aRtInstanceUID = aRtTags['SOPInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5312 aRtFrameOfReferenceUID = aRtTags['ReferencedFrameOfReferenceSequence'][0]['FrameOfReferenceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5313 aCtSeriesUID = aCtTags['SeriesInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5314 aCtInstanceUID = aCtTags['SOPInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5315 aCtFrameOfReferenceUID = aCtTags['FrameOfReferenceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5316 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5317 aContourSequenceCount = len(aRtTags['ROIContourSequence'][0]['ContourSequence']) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5318 # make sure all UIDs have been updated |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5319 self.assertNotEqual(oStudyUID, aStudyUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5320 self.assertNotEqual(oRtSeriesUID, aRtSeriesUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5321 self.assertNotEqual(oRtInstanceUID, aRtInstanceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5322 self.assertNotEqual(oRtFrameOfReferenceUID, aRtFrameOfReferenceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5323 self.assertNotEqual(oCtSeriesUID, aCtSeriesUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5324 self.assertNotEqual(oCtInstanceUID, aCtInstanceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5325 self.assertNotEqual(oCtFrameOfReferenceUID, aCtFrameOfReferenceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5326 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5327 # validate the relationships |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5328 self.assertEqual(oContourSequenceCount, aContourSequenceCount) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5329 self.assertEqual(aCtFrameOfReferenceUID, aRtFrameOfReferenceUID) |
| 256 | 5330 self.assertEqual(aStudyUID, aRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID']) |
| 5331 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
|
5332 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
|
5333 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
|
5334 |
| 256 | 5335 def test_anonymize_relationships_5b(self): |
| 5336 # same test as previous one but, this time, we force the StudyInstanceUID | |
| 5337 ct1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/CT01.dcm') | |
| 5338 rt1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/RT.dcm') | |
| 5339 oStudyId = ct1['ParentStudy'] | |
| 5340 oCtInstanceId = ct1['ID'] | |
| 5341 oRtInstanceId = rt1['ID'] | |
| 5342 | |
| 5343 oCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oCtInstanceId) | |
| 5344 oRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oRtInstanceId) | |
| 5345 | |
| 5346 ### anonymize while forcing the StudyInstanceUID | |
| 5347 | |
| 5348 aStudyId = DoPost(_REMOTE, '/studies/%s/anonymize' % oStudyId, '{ "Replace" : { "StudyInstanceUID" : "1.2.3.4"}, "Force": true}', | |
| 5349 'application/json')['ID'] | |
| 5350 | |
| 5351 ### validate | |
| 5352 | |
| 5353 aSeries = DoGet(_REMOTE, '/studies/%s/series' % aStudyId) | |
| 5354 self.assertEqual(2, len(aSeries)) | |
| 5355 | |
| 5356 aCt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CT', aSeries)) | |
| 5357 aRt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'RTSTRUCT', aSeries)) | |
| 5358 aCtInstanceId = aCt[0]['Instances'][0] | |
| 5359 aRtInstanceId = aRt[0]['Instances'][0] | |
| 5360 aCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aCtInstanceId) | |
| 5361 aRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aRtInstanceId) | |
| 5362 | |
| 5363 self.assertEqual("1.2.3.4", aCtTags['StudyInstanceUID']) | |
| 5364 self.assertEqual("1.2.3.4", aRtTags['StudyInstanceUID']) | |
| 5365 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
|
5366 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5367 |
|
235
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5368 def test_bitbucket_issue_140(self): |
| 266 | 5369 # "Modifying private tags with REST API changes VR from LO to |
| 267 | 5370 # UN." This test fails if DCMTK <= 3.6.1 (e.g. fails on Ubuntu 16.04). |
| 319 | 5371 # 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
|
5372 source = UploadInstance(_REMOTE, 'Issue140.dcm') ['ID'] |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5373 series = DoGet(_REMOTE, '/instances/%s' % source) ['ParentSeries'] |
|
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 target = DoPost(_REMOTE, '/series/%s/modify' % series, { |
| 266 | 5376 'Replace' : { 'RadioButton3' : 'aaabbbccc' }, |
| 5377 'PrivateCreator' : 'RadioLogic', # <= the trick is here | |
|
235
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5378 }, 'application/json') ['ID'] |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5379 |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5380 instances = DoGet(_REMOTE, '/series/%s/instances' % target) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5381 self.assertEqual(1, len(instances)) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5382 |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5383 tags = DoGet(_REMOTE, '/instances/%s/tags' % source) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5384 t = tags['4321,1012'] |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5385 self.assertEqual('String', t['Type']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5386 self.assertEqual('RadioButton3', t['Name']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5387 self.assertEqual('RadioLogic', t['PrivateCreator']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5388 self.assertEqual('jklmopq', t['Value']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5389 |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5390 tags = DoGet(_REMOTE, '/instances/%s/tags' % instances[0]['ID']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5391 t = tags['4321,1012'] |
| 327 | 5392 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
|
5393 self.assertEqual('RadioButton3', t['Name']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5394 self.assertEqual('RadioLogic', t['PrivateCreator']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5395 self.assertEqual('aaabbbccc', t['Value']) |
|
236
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 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5398 def test_find_normalize(self): |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5399 # https://groups.google.com/d/msg/orthanc-users/AIwooGjsh94/YL28MNY4AgAJ |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5400 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5401 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
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 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5404 'Level' : 'Instance', |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5405 'Query' : { 'Rows' : '42' } |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5406 }) ['ID'] |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5407 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5408 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5409 self.assertEqual(1, len(b)) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5410 self.assertFalse('Rows' in b[0]) |
|
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 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5413 'Level' : 'Instance', |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5414 'Query' : { 'Rows' : '42' }, |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5415 'Normalize' : False |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5416 }) ['ID'] |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5417 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5418 b = DoGet(_REMOTE, '/queries/%s/answers' % a) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5419 self.assertEqual(0, len(b)) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5420 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5421 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5422 'Level' : 'Instance', |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5423 'Query' : { 'Rows' : '512' }, |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5424 'Normalize' : False |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5425 }) ['ID'] |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5426 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5427 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5428 self.assertEqual(1, len(b)) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5429 self.assertTrue('Rows' in b[0]) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5430 self.assertEqual('512', b[0]['Rows']) |
| 237 | 5431 |
| 5432 a = DoPost(_REMOTE, '/modalities/self/query', { | |
| 5433 'Level' : 'Instance', | |
| 5434 'Query' : { 'Rows' : '' }, | |
| 5435 'Normalize' : False | |
| 5436 }) ['ID'] | |
| 5437 | |
| 5438 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) | |
| 5439 self.assertEqual(1, len(b)) | |
| 5440 self.assertTrue('Rows' in b[0]) | |
| 5441 self.assertEqual('512', b[0]['Rows']) | |
| 5442 | |
| 5443 self.assertRaises(Exception, lambda: DoPost( | |
| 5444 _REMOTE, '/modalities/self/query', { | |
| 5445 'Level' : 'Instance', | |
| 5446 'Query' : { 'Rows' : '*' }, # Out-of-range value | |
| 5447 'Normalize' : False | |
| 5448 })) | |
|
243
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 |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5451 def test_bitbucket_issue_141(self): |
| 319 | 5452 # 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
|
5453 a = UploadInstance(_REMOTE, 'Issue141.dcm') ['ID'] |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5454 study = '494c8037-b237f263-d8f15075-c8cb2280-daf39bd1' |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5455 |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5456 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f: |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5457 pdf = f.read() |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5458 |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5459 b = DoPost(_REMOTE, '/tools/create-dicom', { |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5460 'Parent' : study, |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5461 'Tags' : {}, |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5462 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5463 }) ['ID'] |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5464 |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5465 tagsA = DoGet(_REMOTE, '/instances/%s/tags?short' % a) |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5466 tagsB = DoGet(_REMOTE, '/instances/%s/tags?short' % b) |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5467 self.assertEqual(tagsA['0008,0005'], tagsB['0008,0005']) |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5468 self.assertEqual(tagsA['0008,1030'], tagsB['0008,1030']) |
|
247
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5469 |
|
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5470 |
|
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5471 def test_modifying_missing_patientid(self): |
|
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5472 # 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
|
5473 UploadInstance(_REMOTE, '2019-06-17-VedranZdesic.dcm') |
|
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5474 DoPost(_REMOTE, '/studies/0c4aca1d-c107a241-6659d6aa-594c674a-a468b94a/modify', {}) |
| 262 | 5475 |
| 5476 | |
| 5477 def test_log_level(self): | |
| 319 | 5478 # https://bugs.orthanc-server.com/show_bug.cgi?id=65 |
| 262 | 5479 original = DoGet(_REMOTE, '/tools/log-level') |
| 5480 | |
| 5481 DoPut(_REMOTE, '/tools/log-level', 'default') | |
| 5482 self.assertEqual('default', DoGet(_REMOTE, '/tools/log-level')) | |
| 5483 DoGet(_REMOTE, '/system') | |
| 5484 | |
| 5485 DoPut(_REMOTE, '/tools/log-level', 'verbose') | |
| 5486 self.assertEqual('verbose', DoGet(_REMOTE, '/tools/log-level')) | |
| 5487 DoGet(_REMOTE, '/system') | |
| 5488 | |
| 5489 DoPut(_REMOTE, '/tools/log-level', 'trace') | |
| 5490 self.assertEqual('trace', DoGet(_REMOTE, '/tools/log-level')) | |
| 5491 DoGet(_REMOTE, '/system') | |
| 5492 | |
| 5493 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/log-level', 'nope')) | |
| 5494 | |
| 5495 # Switch back to the original log level | |
| 5496 DoPut(_REMOTE, '/tools/log-level', original) | |
|
264
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5497 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5498 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5499 def test_upload_compressed(self): |
| 265 | 5500 # New in Orthanc 1.6.0 |
|
264
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5501 with open(GetDatabasePath('DummyCT.dcm.gz'), 'rb') as f: |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5502 d = f.read() |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5503 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5504 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances', d, 'application/dicom')) |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5505 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5506 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances', d, 'application/dicom', |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5507 headers = { 'Content-Encoding' : 'nope' })) |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5508 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5509 a = DoPost(_REMOTE, '/instances', d, 'application/dicom', |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5510 headers = { 'Content-Encoding' : 'gzip' }) |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5511 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a['ID']) |
| 262 | 5512 |
| 5513 | |
|
263
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5514 def test_study_series_find_inconsistency(self): |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5515 # 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
|
5516 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5517 def CountAnswers(query): |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5518 a = DoPost(_REMOTE, 'modalities/self/query', query) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5519 return len(DoGet(_REMOTE, '%s/answers' % a['Path'])) |
|
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 # 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
|
5522 # "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
|
5523 # the "main DICOM tags" of Orthanc. |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5524 UploadInstance(_REMOTE, 'Issue137.dcm') |
|
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 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5527 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5528 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5529 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5530 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5531 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5532 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5533 })) |
|
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 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5536 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5537 ## "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
|
5538 ## 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
|
5539 ## |
|
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 # 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
|
5542 # is wiped out by the normalization |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5543 self.assertEqual(0, 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' : 'NOPE' |
|
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' : False |
|
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(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5551 # This test fails on Orthanc <= 1.5.8 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5552 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5553 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5554 '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
|
5555 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5556 'Normalize' : False |
|
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 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5559 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5560 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5561 'SeriesDescription' : 'THIS^VALUE^IS^WIPED^OUT' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5562 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5563 'Normalize' : True |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5564 })) |
|
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' : 'Study', |
|
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' : '*' # Matches, as wiped out by the normalization |
|
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' : True |
|
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 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5573 for normalize in [ True, False ]: |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5574 # 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
|
5575 # normalization has no effect |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5576 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5577 # "Universal matching" will match all entities, including |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5578 # those with the missing tag |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5579 # 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
|
5580 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5581 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5582 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5583 'SeriesDescription' : '' # Universal matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5584 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5585 'Normalize' : normalize, |
|
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 # "Universal matching" will match all entities, including |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5588 # those with the missing tag |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5589 # 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
|
5590 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5591 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5592 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5593 'SeriesDescription' : '*' # Wildcard matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5594 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5595 'Normalize' : normalize, |
|
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 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5598 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5599 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5600 '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
|
5601 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5602 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5603 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5604 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5605 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5606 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5607 'SeriesDescription' : '*MISMATCHED^VALUE*' |
|
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 'Normalize' : normalize, |
|
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 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5612 # Universal matching matches any instance, even if the |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5613 # 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
|
5614 # makes no sense |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5615 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5616 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5617 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5618 'SeriesDescription' : '' # Universal matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5619 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5620 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5621 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5622 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5623 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5624 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5625 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5626 ## "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
|
5627 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5628 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5629 # 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
|
5630 # is wiped out by the normalization |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5631 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5632 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5633 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5634 'ProtocolName' : 'NOPE' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5635 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5636 'Normalize' : False |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5637 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5638 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5639 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5640 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5641 '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
|
5642 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5643 'Normalize' : False |
|
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 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5646 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5647 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5648 'ProtocolName' : 'THIS^VALUE^IS^WIPED^OUT' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5649 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5650 'Normalize' : True |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5651 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5652 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5653 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5654 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5655 'ProtocolName' : '*' # Matches, as wiped out by the normalization |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5656 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5657 'Normalize' : True |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5658 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5659 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5660 for normalize in [ True, False ]: |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5661 # 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
|
5662 # normalization has no effect |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5663 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5664 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5665 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5666 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5667 'ProtocolName' : '' # Universal matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5668 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5669 'Normalize' : normalize, |
|
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(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5672 'Level' : 'Series', |
|
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' : '*' # 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
|
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 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5679 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5680 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5681 'ProtocolName' : '*MISMATCHED^VALUE*' |
|
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 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5684 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5685 |
|
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' : 'Study', |
|
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 'ProtocolName' : '' # 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 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5694 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5695 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5696 ## "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
|
5697 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5698 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5699 for level in [ 'Study', 'Series' ] : |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5700 for normalize in [ True, False ]: |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5701 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5702 'Level' : level, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5703 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5704 'StudyInstanceUID' : '' # Universal matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5705 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5706 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5707 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5708 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5709 'Level' : level, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5710 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5711 'StudyInstanceUID' : 'MISMATCHED^VALUE' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5712 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5713 'Normalize' : normalize, |
|
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 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5716 'Level' : level, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5717 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5718 '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
|
5719 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5720 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5721 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5722 |
| 269 | 5723 # 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
|
5724 # This test fails on Orthanc <= 1.5.8 |
| 269 | 5725 self.assertRaises(Exception, lambda: CountAnswers({ |
|
263
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5726 'Level' : level, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5727 'Query' : { |
| 269 | 5728 'StudyInstanceUID' : '*' |
|
263
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5729 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5730 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5731 })) |
| 265 | 5732 |
| 5733 | |
| 5734 def test_rendered(self): | |
| 5735 # New in Orthanc 1.6.0 | |
| 5736 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID'] | |
| 5737 im = GetImage(_REMOTE, '/instances/%s/rendered' % i) | |
| 5738 self.assertEqual("RGB", im.mode) | |
| 5739 self.assertEqual(41, im.size[0]) | |
| 5740 self.assertEqual(41, im.size[1]) | |
| 5741 | |
| 5742 # http://effbot.org/zone/pil-comparing-images.htm | |
| 5743 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png')) | |
| 5744 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None) | |
| 5745 | |
| 5746 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10' % 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' % 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=128' % i) | |
| 5757 self.assertEqual("RGB", im.mode) | |
| 5758 self.assertEqual(128, im.size[0]) | |
| 5759 self.assertEqual(128, im.size[1]) | |
| 5760 | |
| 5761 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10&smooth=0' % i) | |
| 5762 self.assertEqual("RGB", im.mode) | |
| 5763 self.assertEqual(10, im.size[0]) | |
| 5764 self.assertEqual(10, im.size[1]) | |
| 5765 | |
| 5766 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10&smooth=1' % i) | |
| 5767 self.assertEqual("RGB", im.mode) | |
| 5768 self.assertEqual(10, im.size[0]) | |
| 5769 self.assertEqual(10, im.size[1]) | |
| 5770 | |
| 5771 im = GetImage(_REMOTE, '/instances/%s/rendered?height=5&width=10' % i) | |
| 5772 self.assertEqual("RGB", im.mode) | |
| 5773 self.assertEqual(5, im.size[0]) | |
| 5774 self.assertEqual(5, im.size[1]) | |
| 5775 | |
| 5776 | |
| 5777 # Grayscale image | |
| 5778 i = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] | |
| 5779 im = GetImage(_REMOTE, '/instances/%s/rendered' % i) | |
| 5780 self.assertEqual("L", im.mode) | |
| 5781 self.assertEqual(288, im.size[0]) | |
| 5782 self.assertEqual(288, im.size[1]) | |
| 5783 self.assertEqual(0, im.getpixel((0, 0))) | |
| 5784 | |
| 5785 # Those are the original windowing parameters that are written | |
| 5786 # inside the DICOM file | |
| 5787 im2 = GetImage(_REMOTE, '/instances/%s/rendered?window-center=248.009544468547&window-width=431.351843817788' % i) | |
| 5788 self.assertEqual("L", im2.mode) | |
| 5789 self.assertEqual(288, im2.size[0]) | |
| 5790 self.assertEqual(288, im2.size[1]) | |
| 5791 self.assertTrue(ImageChops.difference(im, im2).getbbox() is None) | |
| 5792 | |
| 5793 im = GetImage(_REMOTE, '/instances/%s/rendered?width=512&smooth=0' % i) | |
| 5794 self.assertEqual("L", im.mode) | |
| 5795 self.assertEqual(512, im.size[0]) | |
| 5796 self.assertEqual(512, im.size[1]) | |
| 5797 | |
| 5798 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&smooth=0' % i) | |
| 5799 self.assertEqual("L", im.mode) | |
| 5800 self.assertEqual(10, im.size[0]) | |
| 5801 self.assertEqual(10, im.size[1]) | |
| 5802 | |
| 5803 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&smooth=1' % i) | |
| 5804 self.assertEqual("L", im.mode) | |
| 5805 self.assertEqual(10, im.size[0]) | |
| 5806 self.assertEqual(10, im.size[1]) | |
| 5807 | |
| 5808 im = GetImage(_REMOTE, '/instances/%s/rendered?width=1&window-center=-1000' % i) | |
| 5809 self.assertEqual("L", im.mode) | |
| 5810 self.assertEqual(1, im.size[0]) | |
| 5811 self.assertEqual(1, im.size[1]) | |
| 5812 self.assertEqual(255, im.getpixel((0, 0))) | |
| 5813 | |
| 5814 im = GetImage(_REMOTE, '/instances/%s/rendered?width=1&window-center=1000' % i) | |
| 5815 self.assertEqual("L", im.mode) | |
| 5816 self.assertEqual(1, im.size[0]) | |
| 5817 self.assertEqual(1, im.size[1]) | |
| 5818 self.assertEqual(0, im.getpixel((0, 0))) | |
| 5819 | |
| 5820 | |
| 5821 # Test monochrome 1 | |
| 5822 i = UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')['ID'] | |
| 5823 im = GetImage(_REMOTE, '/instances/%s/rendered' % i) | |
| 5824 self.assertEqual("L", im.mode) | |
| 5825 self.assertEqual(2010, im.size[0]) | |
| 5826 self.assertEqual(2446, im.size[1]) | |
| 5827 self.assertEqual(0, im.getpixel((0, 0))) | |
| 5828 im = GetImage(_REMOTE, '/instances/%s/rendered?width=20' % i) | |
| 5829 self.assertEqual("L", im.mode) | |
| 5830 self.assertEqual(20, im.size[0]) | |
| 5831 self.assertEqual(24, im.size[1]) | |
| 5832 im = GetImage(_REMOTE, '/instances/%s/rendered?height=24' % i) | |
| 5833 self.assertEqual("L", im.mode) | |
| 5834 self.assertEqual(20, im.size[0]) | |
| 5835 self.assertEqual(24, im.size[1]) | |
| 5836 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&height=24' % i) | |
| 5837 self.assertEqual("L", im.mode) | |
| 5838 self.assertEqual(10, im.size[0]) | |
| 5839 self.assertEqual(12, im.size[1]) | |
| 5840 im = GetImage(_REMOTE, '/instances/%s/rendered?width=40&height=24' % i) | |
| 5841 self.assertEqual("L", im.mode) | |
| 5842 self.assertEqual(20, im.size[0]) | |
| 5843 self.assertEqual(24, im.size[1]) | |
|
268
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5844 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5845 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5846 def test_bitbucket_issue_154(self): |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5847 # "Matching against list of UID-s by C-MOVE" |
| 319 | 5848 # 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
|
5849 a = UploadInstance(_REMOTE, 'Issue154-d1.dcm') ['ID'] |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5850 b = UploadInstance(_REMOTE, 'Issue154-d2.dcm') ['ID'] |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5851 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5852 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
|
5853 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
|
5854 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
|
5855 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5856 # C-FIND is working on list of UIDs |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5857 i = CallFindScu([ '-k', 'QueryRetrieveLevel=SERIES', |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5858 '-k', 'StudyInstanceUID=%s' % study, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5859 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2) ]) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5860 series = re.findall('\(0020,000e\).*?\[(.*?)\]', i) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5861 self.assertEqual(2, len(series)) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5862 self.assertTrue(series1 in series) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5863 self.assertTrue(series2 in series) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5864 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5865 # Individual retrieval is working in Orthanc < 1.6.0 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5866 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5867 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5868 '--study', '-k', 'QueryRetrieveLevel=SERIES', |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5869 '-k', 'StudyInstanceUID=%s' % study, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5870 '-k', 'SeriesInstanceUID=%s' % series1, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5871 ]))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5872 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5873 '--study', '-k', 'QueryRetrieveLevel=SERIES', |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5874 '-k', 'StudyInstanceUID=%s' % study, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5875 '-k', 'SeriesInstanceUID=%s' % series2, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5876 ]))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5877 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5878 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5879 DropOrthanc(_LOCAL) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5880 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5881 # 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
|
5882 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5883 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5884 '--study', '-k', 'QueryRetrieveLevel=SERIES', |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5885 '-k', 'StudyInstanceUID=%s' % study, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5886 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2), |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5887 ]))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
5888 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5889 |
|
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 def test_storage_commitment_api(self): |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5892 # 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
|
5893 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5894 def WaitTransaction(uid): |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5895 while True: |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5896 s = DoGet(_REMOTE, '/storage-commitment/%s' % uid) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5897 if s['Status'] != 'Pending': |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5898 return s |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5899 else: |
|
342
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
5900 time.sleep(0.01) |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5901 |
| 281 | 5902 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5903 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
|
5904 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
|
5905 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5906 # Against self |
| 281 | 5907 transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', { |
| 5908 "DicomInstances" : [ [ sopClassUid, sopInstanceUid ] ], | |
| 5909 }) ['ID'] | |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5910 self.assertTrue(transaction.startswith('2.25.')) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5911 |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5912 result = WaitTransaction(transaction) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5913 self.assertEqual('ORTHANC', result['RemoteAET']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5914 self.assertEqual('Success', result['Status']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5915 self.assertEqual(1, len(result['Success'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5916 self.assertEqual(0, len(result['Failures'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5917 self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5918 self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5919 |
| 281 | 5920 tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', { |
| 5921 "DicomInstances" : [ | |
| 5922 { 'SOPClassUID' : sopClassUid, | |
| 5923 'SOPInstanceUID' : sopInstanceUid }, | |
| 5924 ], | |
| 5925 }) | |
| 5926 self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID']) | |
| 5927 self.assertEqual(result, WaitTransaction(transaction)) | |
| 5928 | |
| 5929 tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', { | |
| 5930 "Resources" : [ | |
| 5931 instance['ID'], | |
| 5932 instance['ParentSeries'], | |
| 5933 instance['ParentStudy'], | |
| 5934 instance['ParentPatient'], | |
| 5935 ] | |
| 5936 }) | |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5937 self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5938 self.assertEqual(result, WaitTransaction(transaction)) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5939 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5940 |
| 281 | 5941 transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', { |
| 5942 "DicomInstances" : [ | |
| 5943 [ 'nope', 'nope2' ], | |
| 5944 [ sopClassUid, sopInstanceUid ], | |
| 5945 ], | |
| 5946 }) ['ID'] | |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5947 self.assertTrue(transaction.startswith('2.25.')) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5948 |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5949 result = WaitTransaction(transaction) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5950 self.assertEqual('ORTHANC', result['RemoteAET']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5951 self.assertEqual('Failure', result['Status']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5952 self.assertEqual(1, len(result['Success'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5953 self.assertEqual(1, len(result['Failures'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5954 self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5955 self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5956 self.assertEqual('nope', result['Failures'][0]['SOPClassUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5957 self.assertEqual('nope2', result['Failures'][0]['SOPInstanceUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5958 self.assertEqual(274, result['Failures'][0]['FailureReason']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5959 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5960 # Cannot remove items from a failed storage commitment transaction |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5961 self.assertRaises(Exception, lambda: |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5962 DoPost(_REMOTE, '/storage-commitment/%s/remove' % transaction)) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5963 |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5964 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5965 # Against Orthanc 0.8.6, that does not support storage commitment |
|
509
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
5966 if not IsOrthancVersionAbove(_LOCAL, 1, 11, 2): # don't know which specific version the behaviour changed but this fails with 0.8.6 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
5967 self.assertRaises(Exception, lambda: |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
5968 DoPost(_REMOTE, '/modalities/orthanctest/storage-commitment', { |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
5969 "DicomInstances" : [ |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
5970 [ sopClassUid, sopInstanceUid ], |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
5971 ] |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
5972 })) |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5973 |
|
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 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5976 def test_storage_commitment_store(self): |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5977 # 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
|
5978 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5979 def WaitTransaction(uid): |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5980 while True: |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5981 s = DoGet(_REMOTE, '/storage-commitment/%s' % uid) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5982 if s['Status'] != 'Pending': |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5983 return s |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5984 else: |
|
342
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
5985 time.sleep(0.01) |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
5986 |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5987 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5988 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5989 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
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 # The Orthanc 0.8.6 from "_LOCAL" does not support storage commitment |
|
509
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
5992 if not IsOrthancVersionAbove(_LOCAL, 1, 11, 2): # don't know which specific version the behaviour changed but this fails with 0.8.6 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
5993 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
5994 'Resources' : [ i ], |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
5995 'StorageCommitment' : True, |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
5996 })) |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5997 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5998 j = DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
5999 'Resources' : [ i ], |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6000 'StorageCommitment' : False, |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6001 }) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6002 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6003 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6004 j = DoPost(_REMOTE, '/modalities/self/store', { |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6005 'Resources' : [ i ], |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6006 'StorageCommitment' : True, |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6007 }) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6008 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6009 transaction = j['StorageCommitmentTransactionUID'] |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6010 self.assertTrue(transaction.startswith('2.25.')) |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6011 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6012 result = WaitTransaction(transaction) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6013 self.assertEqual('ORTHANC', result['RemoteAET']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6014 self.assertEqual('Success', result['Status']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6015 self.assertEqual(1, len(result['Success'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6016 self.assertEqual(0, len(result['Failures'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6017 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
|
6018 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
|
6019 result['Success'][0]['SOPInstanceUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6020 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6021 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6022 DoPost(_REMOTE, '/storage-commitment/%s/remove' % transaction) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6023 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
285
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6024 |
|
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 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
|
6027 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6028 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6029 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6030 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f: |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6031 dicom = f.read() |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6032 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6033 self.assertRaises(Exception, lambda: DoPost( |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6034 _REMOTE, '/modalities/orthanctest/store-straight', 'nope', 'nope')) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6035 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6036 answer = DoPost(_REMOTE, '/modalities/orthanctest/store-straight', dicom, 'nope') |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6037 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6038 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
|
6039 answer['SOPClassUID']) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6040 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
|
6041 answer['SOPInstanceUID']) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6042 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6043 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6044 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
289
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6045 |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6046 |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6047 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
|
6048 # Add a RLE-encoded DICOM file |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6049 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
|
6050 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6051 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6052 rleSize = len(DoGet(_REMOTE, '/instances/%s/file' % i)) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6053 |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6054 # Export the instance, with transcoding: "_REMOTE" is the |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6055 # Orthanc server being tested |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6056 try: |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6057 DoDelete(_REMOTE, '/modalities/toto') |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6058 except: |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6059 pass |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6060 |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6061 params = DoGet(_REMOTE, '/modalities?expand') ['orthanctest'] |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6062 DoPut(_REMOTE, '/modalities/toto', params) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6063 DoPost(_REMOTE, '/modalities/toto/store', str(i), 'text/plain') |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6064 j = DoGet(_LOCAL, '/instances') |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6065 self.assertEqual(1, len(j)) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6066 uncompressedSize = len(DoGet(_LOCAL, '/instances/%s/file' % j[0])) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6067 self.assertTrue(uncompressedSize > rleSize / 2) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6068 |
|
509
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6069 # Export, with transcoding disabled => this fails with 0.8.6 but not with more recent versions |
|
289
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6070 params['AllowTranscoding'] = False |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6071 DoPut(_REMOTE, '/modalities/toto', params) |
|
509
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6072 if not IsOrthancVersionAbove(_LOCAL, 1, 11, 2): # don't know which specific version the behaviour changed but this fails with 0.8.6 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6073 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/modalities/toto/store', str(i), 'text/plain')) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6074 else: |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6075 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
|
6076 DoDelete(_REMOTE, '/modalities/toto') |
|
290
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6077 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6078 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6079 def test_bitbucket_issue_169(self): |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6080 with open(GetDatabasePath('Issue169.dcm.bz2'), 'rb') as f: |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6081 dicom = bz2.decompress(f.read()) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6082 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6083 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
|
6084 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6085 self.assertEqual(44350560, len(dicom)) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6086 i = DoPost(_REMOTE, '/instances', dicom, 'application/dicom') ['ID'] |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6087 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6088 tags = DoGet(_REMOTE, '/instances/%s/tags' % i) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6089 self.assertEqual('NORMAL', tags['1337,1001']['Value']) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6090 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6091 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6092 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6093 j = DoGet(_LOCAL, '/instances') |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6094 self.assertEqual(1, len(j)) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6095 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6096 # 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
|
6097 # 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
|
6098 # Little Endian" (1.2.840.10008.1.2) |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6099 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax( |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6100 DoGet(_LOCAL, '/instances/%s/file' % j[0]))) |
|
290
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6101 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6102 # 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
|
6103 # because of this transcoding |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6104 tags = DoGet(_LOCAL, '/instances/%s/tags' % j[0]) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6105 self.assertEqual('NORMAL', tags['1337,1001']['Value']) |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6106 |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6107 |
|
302
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6108 def test_modify_transcode_instance(self): |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6109 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6110 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax( |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6111 DoGet(_REMOTE, '/instances/%s/file' % i))) |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6112 |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6113 a = ExtractDicomTags(DoGet(_REMOTE, '/instances/%s/file' % i), [ 'SOPInstanceUID' ]) [0] |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6114 self.assertTrue(len(a) > 20) |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6115 |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6116 SYNTAXES = [ |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6117 '1.2.840.10008.1.2', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6118 '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
|
6119 #'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
|
6120 '1.2.840.10008.1.2.2', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6121 '1.2.840.10008.1.2.4.50', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6122 '1.2.840.10008.1.2.4.51', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6123 '1.2.840.10008.1.2.4.57', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6124 '1.2.840.10008.1.2.4.70', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6125 ] |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6126 |
| 304 | 6127 if HasGdcmPlugin(_REMOTE): |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6128 SYNTAXES = SYNTAXES + [ |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6129 '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
|
6130 '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
|
6131 '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
|
6132 '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
|
6133 ] |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6134 |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6135 for syntax in SYNTAXES: |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6136 transcoded = DoPost(_REMOTE, '/instances/%s/modify' % i, { |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6137 'Transcode' : syntax, |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6138 'Keep' : [ 'SOPInstanceUID' ], |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6139 'Force' : True, |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6140 }) |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6141 |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6142 self.assertEqual(syntax, GetTransferSyntax(transcoded)) |
|
292
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6143 |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6144 b = ExtractDicomTags(transcoded, [ 'SOPInstanceUID' ]) [0] |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6145 self.assertTrue(len(b) > 20) |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6146 if syntax in [ '1.2.840.10008.1.2.4.50', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6147 '1.2.840.10008.1.2.4.51', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6148 '1.2.840.10008.1.2.4.81', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6149 '1.2.840.10008.1.2.4.91' ]: |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6150 # Lossy transcoding: The SOP instance UID must have changed |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6151 self.assertNotEqual(a, b) |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6152 else: |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6153 self.assertEqual(a, b) |
|
292
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6154 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6155 def test_archive_transcode(self): |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6156 info = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm') |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6157 |
|
293
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6158 # GET on "/media" |
|
292
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6159 z = GetArchive(_REMOTE, '/patients/%s/media' % info['ParentPatient']) |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6160 self.assertEqual(2, len(z.namelist())) |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6161 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
|
6162 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6163 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
|
6164 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6165 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
|
6166 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
|
6167 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6168 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
|
6169 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
|
6170 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6171 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
|
6172 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
|
6173 |
|
293
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 # POST on "/media" |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6176 self.assertRaises(Exception, lambda: PostArchive( |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6177 _REMOTE, '/patients/%s/media' % info['ParentPatient'], { 'Transcode' : 'nope' })) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6178 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6179 z = PostArchive(_REMOTE, '/patients/%s/media' % info['ParentPatient'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6180 'Transcode' : '1.2.840.10008.1.2.4.50', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6181 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6182 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
|
6183 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6184 z = PostArchive(_REMOTE, '/studies/%s/media' % info['ParentStudy'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6185 'Transcode' : '1.2.840.10008.1.2.4.51', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6186 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6187 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
|
6188 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6189 z = PostArchive(_REMOTE, '/series/%s/media' % info['ParentSeries'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6190 'Transcode' : '1.2.840.10008.1.2.4.57', |
|
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 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
|
6193 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6194 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6195 # GET on "/archive" |
|
292
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6196 z = GetArchive(_REMOTE, '/patients/%s/archive' % info['ParentPatient']) |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6197 self.assertEqual(1, len(z.namelist())) |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6198 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
|
6199 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6200 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
|
6201 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6202 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
|
6203 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
|
6204 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6205 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
|
6206 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
|
6207 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6208 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
|
6209 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
|
6210 |
|
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 # POST on "/archive" |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6213 self.assertRaises(Exception, lambda: PostArchive( |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6214 _REMOTE, '/patients/%s/archive' % info['ParentPatient'], { 'Transcode' : 'nope' })) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6215 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6216 z = PostArchive(_REMOTE, '/patients/%s/archive' % info['ParentPatient'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6217 'Transcode' : '1.2.840.10008.1.2.4.50', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6218 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6219 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
|
6220 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6221 z = PostArchive(_REMOTE, '/studies/%s/archive' % 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('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
|
6225 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6226 z = PostArchive(_REMOTE, '/series/%s/archive' % info['ParentSeries'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6227 'Transcode' : '1.2.840.10008.1.2.4.57', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6228 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6229 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
|
6230 |
|
293
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6231 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6232 # "/tools/create-*" |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6233 z = PostArchive(_REMOTE, '/tools/create-archive', { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6234 'Resources' : [ info['ParentStudy'] ], |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6235 'Transcode' : '1.2.840.10008.1.2.4.50', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6236 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6237 self.assertEqual(1, len(z.namelist())) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6238 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
|
6239 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6240 z = PostArchive(_REMOTE, '/tools/create-media', { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6241 'Resources' : [ info['ParentStudy'] ], |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6242 'Transcode' : '1.2.840.10008.1.2.4.51', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6243 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6244 self.assertEqual(2, len(z.namelist())) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6245 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
|
6246 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6247 z = PostArchive(_REMOTE, '/tools/create-media-extended', { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6248 'Resources' : [ info['ParentStudy'] ], |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6249 'Transcode' : '1.2.840.10008.1.2.4.57', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6250 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6251 self.assertEqual(2, len(z.namelist())) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6252 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
|
6253 |
| 308 | 6254 |
|
301
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6255 def test_modify_keep_source(self): |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6256 # 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
|
6257 i = UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6258 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6259 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6260 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], { |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6261 'Replace' : { |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6262 'StationName' : 'TEST', |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6263 }, |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6264 'KeepSource' : True, |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6265 }) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6266 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6267 s = DoGet(_REMOTE, '/studies') |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6268 self.assertEqual(2, len(s)) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6269 self.assertTrue(i['ParentStudy'] in s) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6270 self.assertTrue(j['ID'] in s) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6271 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6272 DoDelete(_REMOTE, '/studies/%s' % j['ID']) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6273 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6274 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6275 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], { |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6276 'Replace' : { |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6277 'StationName' : 'TEST', |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6278 }, |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6279 'KeepSource' : False, |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6280 }) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6281 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6282 s = DoGet(_REMOTE, '/studies') |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6283 self.assertEqual(1, len(s)) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6284 self.assertFalse(i['ParentStudy'] in s) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6285 self.assertTrue(j['ID'] in s) |
|
302
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6286 |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6287 |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6288 def test_modify_transcode_study(self): |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6289 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm') |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6290 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
|
6291 DoGet(_REMOTE, '/instances/%s/file' % i['ID']))) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6292 |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6293 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6294 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], { |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6295 'Transcode' : '1.2.840.10008.1.2.4.50', |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6296 'KeepSource' : False |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6297 }) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6298 |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6299 k = DoGet(_REMOTE, '/instances') |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6300 self.assertEqual(1, len(k)) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6301 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
|
6302 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
|
6303 DoGet(_REMOTE, '/instances/%s/file' % k[0]))) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6304 |
|
305
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6305 |
|
498
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6306 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
|
6307 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
|
6308 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
|
6309 'Replace' : replaceTags, |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6310 'Force': force, |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6311 'KeepSource' : keepSource |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6312 }) |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6313 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6314 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
|
6315 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6316 i = UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6317 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
|
6318 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6319 # 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
|
6320 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
|
6321 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
|
6322 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6323 # 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
|
6324 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
|
6325 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
|
6326 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6327 # 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
|
6328 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
|
6329 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
|
6330 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6331 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6332 # 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
|
6333 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
|
6334 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
|
6335 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
|
6336 |
| 500 | 6337 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
|
6338 # 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
|
6339 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
|
6340 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
|
6341 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
|
6342 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6343 |
|
504
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6344 def test_modify_study_module_reconstruction(self): |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6345 if IsOrthancVersionAbove(_REMOTE, 1, 11, 3): |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6346 def UploadAndModify(level, resourceId, replaceTags, force, keepSource, dropOrthanc=True): |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6347 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6348 if dropOrthanc: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6349 DropOrthanc(_REMOTE) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6350 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6351 UploadFolder(_REMOTE, 'Knee/T1') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6352 UploadFolder(_REMOTE, 'Knee/T2') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6353 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6354 if dropOrthanc: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6355 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6356 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6357 modifyResponse = DoPost(_REMOTE, '/%s/%s/modify' % (level, resourceId), { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6358 'Replace' : replaceTags, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6359 'Force': force, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6360 'KeepSource' : keepSource |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6361 }) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6362 modifiedResource = DoGet(_REMOTE, '/%s/%s' % (level, modifyResponse['ID'])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6363 return (modifyResponse, modifiedResource) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6364 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6365 kneeSeriesT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6366 kneeSeriesT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6367 kneeStudy = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6368 kneePatient = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6369 kneeStudyInstanceUID = '2.16.840.1.113669.632.20.121711.10000160881' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6370 kneeSeriesInstanceUIDT1 = '1.3.46.670589.11.17521.5.0.3124.2008081908564160709' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6371 kneeSeriesInstanceUIDT2 = '1.3.46.670589.11.17521.5.0.3124.2008081909090037350' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6372 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6373 ####### study level tests ####### |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6374 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6375 # modify study description and make sure the MainDicomTags are updated |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6376 modifyResponse, modifiedResource = UploadAndModify('studies', kneeStudy, replaceTags={ |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6377 'StudyInstanceUID': kneeStudyInstanceUID, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6378 'StudyDescription': 'TOTO' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6379 }, force=True, keepSource=True) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6380 self.assertEqual(kneeStudy, modifyResponse['ID']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6381 self.assertEqual('TOTO', modifiedResource['MainDicomTags']['StudyDescription']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6382 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6383 # modify patient name at study level and make sure the PatientMainDicomTags are updated + the patient has been updated |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6384 modifyResponse, modifiedResource = UploadAndModify('studies', kneeStudy, replaceTags={ |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6385 'StudyInstanceUID': kneeStudyInstanceUID, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6386 'PatientName': 'TOTO' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6387 }, force=True, keepSource=True) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6388 self.assertEqual(kneeStudy, modifyResponse['ID']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6389 self.assertEqual('TOTO', modifiedResource['PatientMainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6390 patient = DoGet(_REMOTE, '/patients/%s' % kneePatient) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6391 self.assertEqual('TOTO', patient['MainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6392 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6393 # modify patient name and patient id at study level and make sure the PatientMainDicomTags are updated + a new patient has been created + the old one does not exist anymore |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6394 modifyResponse, modifiedResource = UploadAndModify('studies', kneeStudy, replaceTags={ |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6395 'StudyInstanceUID': kneeStudyInstanceUID, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6396 'PatientID': 'TOTO_ID', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6397 'PatientName': 'TOTO' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6398 }, force=True, keepSource=True) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6399 self.assertNotEqual(kneeStudy, modifyResponse['ID']) # the study has changed since the PatientID has changed |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6400 self.assertEqual('TOTO', modifiedResource['PatientMainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6401 self.assertEqual('TOTO_ID', modifiedResource['PatientMainDicomTags']['PatientID']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6402 patient = DoGet(_REMOTE, '/patients/%s' % modifyResponse['PatientID']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6403 self.assertEqual('TOTO', patient['MainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6404 self.assertEqual('TOTO_ID', patient['MainDicomTags']['PatientID']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6405 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6406 ####### series level tests ####### |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6407 # modify series description and make sure the MainDicomTags are updated |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6408 modifyResponse, modifiedResource = UploadAndModify('series', kneeStudy, replaceTags={ |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6409 'SeriesInstanceUID': kneeSeriesInstanceUIDT1, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6410 'StudyInstanceUID': kneeStudyInstanceUID, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6411 'SeriesDescription': 'TOTO' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6412 }, force=True, keepSource=True) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6413 self.assertEqual(kneeSeriesT1, modifyResponse['ID']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6414 self.assertEqual('TOTO', modifiedResource['MainDicomTags']['SeriesDescription']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6415 self.assertEqual(kneeStudy, modifyResponse['ParentResources'][0]) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6416 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6417 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6418 def test_rename_patient_with_multiple_studies(self): |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6419 if IsOrthancVersionAbove(_REMOTE, 1, 11, 3): |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6420 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6421 patientOrthancId = '5436938e-7ae68340-5ea6ad3c-4e6e09bd-1bd335de' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6422 patientDicomId = 'TEST_1' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6423 patientName = 'Test' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6424 study1234 = '72de3b86-da4b2556-bb33f32f-d1d84f80-fb017059' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6425 study2345 = '3594f32b-dcf60e81-58252b67-66222714-c09fca81' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6426 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6427 DropOrthanc(_REMOTE) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6428 UploadFolder(_REMOTE, 'PatientWith2studies') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6429 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6430 # each sub-test is in a dedicated 'if' for clarity |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6431 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6432 if True: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6433 # it shall be impossible to rename a patient when modifying a study if that patient already has other studies |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6434 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/%s/%s/modify' % ('studies', study1234), { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6435 'Replace' : {'PatientName': "TOTO"}, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6436 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6437 'KeepSource' : True |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6438 })) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6439 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6440 if True: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6441 # rename the patient (at patient level) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6442 modifyResponse = DoPost(_REMOTE, '/%s/%s/modify' % ('patients', patientOrthancId), { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6443 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6444 'PatientName': 'TOTO' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6445 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6446 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6447 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6448 }) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6449 modifiedPatient = DoGet(_REMOTE, '/%s/%s' % ('patients', modifyResponse['ID'])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6450 # make sure the patient name has been edited at patient level |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6451 self.assertEqual('TOTO', modifiedPatient['MainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6452 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6453 # there should only be 2 studies since we have set KeepSource=False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6454 self.assertEqual(2, len(modifiedPatient['Studies'])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6455 modifiedStudy1 = DoGet(_REMOTE, '/%s/%s' % ('studies', modifiedPatient['Studies'][0])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6456 modifiedStudy2 = DoGet(_REMOTE, '/%s/%s' % ('studies', modifiedPatient['Studies'][1])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6457 self.assertEqual('TOTO', modifiedStudy1['PatientMainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6458 self.assertEqual('TOTO', modifiedStudy2['PatientMainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6459 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6460 if True: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6461 # rename the patient (at patient level) and don't keep sources and preserve StudyInstanceUID |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6462 DropOrthanc(_REMOTE) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6463 UploadFolder(_REMOTE, 'PatientWith2studies') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6464 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6465 # rename the patient (at patient level) and don't keep sources and preserve StudyInstanceUID, SeriesInstanceUID |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6466 modifyResponse = DoPost(_REMOTE, '/%s/%s/modify' % ('patients', patientOrthancId), { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6467 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6468 'PatientName': 'TOTO' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6469 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6470 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID'], |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6471 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6472 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6473 }) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6474 modifiedPatient = DoGet(_REMOTE, '/%s/%s' % ('patients', modifyResponse['ID'])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6475 # make sure tha patient name has been edited at patient level |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6476 self.assertEqual('TOTO', modifiedPatient['MainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6477 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6478 # there should only be 2 studies since we have set KeepSource=False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6479 self.assertEqual(2, len(modifiedPatient['Studies'])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6480 modifiedStudy1 = DoGet(_REMOTE, '/%s/%s' % ('studies', modifiedPatient['Studies'][0])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6481 modifiedStudy2 = DoGet(_REMOTE, '/%s/%s' % ('studies', modifiedPatient['Studies'][1])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6482 # the StudyInstanceUID shall not have changed |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6483 self.assertIn(modifiedStudy1['MainDicomTags']['StudyInstanceUID'], ['1.2.3', '2.3.4']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6484 self.assertIn(modifiedStudy2['MainDicomTags']['StudyInstanceUID'], ['1.2.3', '2.3.4']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6485 # the DB model of parent shall have been reconstructed |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6486 self.assertEqual('TOTO', modifiedStudy1['PatientMainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6487 self.assertEqual('TOTO', modifiedStudy2['PatientMainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6488 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6489 if True: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6490 # it shall not be possible to keep all dicom UID and have KeepSource at False since the modified instances |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6491 # would have the same orthanc ids as the source ids -> they would be deleted |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6492 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/%s/%s/modify' % ('patients', study1234), { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6493 'Replace' : {'PatientName': "TOTO"}, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6494 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6495 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID'], |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6496 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6497 })) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6498 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6499 if True: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6500 # rename the patient (at patient level) and don't keep sources and preserve all DicomID |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6501 DropOrthanc(_REMOTE) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6502 UploadFolder(_REMOTE, 'PatientWith2studies') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6503 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6504 # rename the patient (at patient level) and don't keep sources and preserve StudyInstanceUID |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6505 modifyResponse = DoPost(_REMOTE, '/%s/%s/modify' % ('patients', patientOrthancId), { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6506 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6507 'PatientName': 'TOTO' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6508 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6509 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID'], |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6510 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6511 'KeepSource' : True |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6512 }) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6513 modifiedPatient = DoGet(_REMOTE, '/%s/%s' % ('patients', modifyResponse['ID'])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6514 # make sure tha patient name has been edited at patient level |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6515 self.assertEqual('TOTO', modifiedPatient['MainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6516 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6517 # there should only be 2 studies since we have set KeepSource=False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6518 self.assertEqual(2, len(modifiedPatient['Studies'])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6519 modifiedStudy1 = DoGet(_REMOTE, '/%s/%s' % ('studies', modifiedPatient['Studies'][0])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6520 modifiedStudy2 = DoGet(_REMOTE, '/%s/%s' % ('studies', modifiedPatient['Studies'][1])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6521 # the StudyInstanceUID shall not have changed |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6522 self.assertIn(modifiedStudy1['MainDicomTags']['StudyInstanceUID'], ['1.2.3', '2.3.4']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6523 self.assertIn(modifiedStudy2['MainDicomTags']['StudyInstanceUID'], ['1.2.3', '2.3.4']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6524 # the DB model of parent shall have been reconstructed |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6525 self.assertEqual('TOTO', modifiedStudy1['PatientMainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6526 self.assertEqual('TOTO', modifiedStudy2['PatientMainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6527 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6528 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6529 if True: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6530 # try to attach the knee study to an existing patient |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6531 DropOrthanc(_REMOTE) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6532 UploadFolder(_REMOTE, 'PatientWith2studies') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6533 UploadFolder(_REMOTE, 'Knee/T1') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6534 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6535 kneeStudy = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6536 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6537 # try to change the PatientID at study level. This only works if we specify all Patient Tags and if they are identical to the existing Patient in DB |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6538 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6539 # this should fail if only specifying the PatientID |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6540 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/%s/%s/modify' % ('studies', kneeStudy), { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6541 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6542 'PatientID': 'TEST_1' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6543 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6544 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6545 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6546 })) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6547 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6548 # this should fail if specifying all tags but one of them is not correct |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6549 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/%s/%s/modify' % ('studies', kneeStudy), { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6550 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6551 'PatientID': 'TEST_1', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6552 'PatientName': 'Test', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6553 'PatientBirthDate': '19000101', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6554 'PatientSex': 'F' # this is wrong ! |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6555 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6556 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6557 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6558 })) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6559 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6560 # this should fail if specifying a tag that is not defined in DB for that patient |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6561 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/%s/%s/modify' % ('studies', kneeStudy), { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6562 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6563 'PatientID': 'TEST_1', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6564 'PatientName': 'Test', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6565 'PatientBirthDate': '19000101', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6566 'PatientSex': 'M', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6567 '0010,1000': 'TUTU' # this does not exist in DB |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6568 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6569 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6570 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6571 })) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6572 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6573 # this should now work with all correct tags |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6574 modifyResponse = DoPost(_REMOTE, '/%s/%s/modify' % ('studies', kneeStudy), { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6575 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6576 'PatientID': 'TEST_1', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6577 'PatientName': 'Test', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6578 'PatientBirthDate': '19000101', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6579 'PatientSex': 'M' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6580 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6581 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6582 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6583 }) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6584 modifiedStudy = DoGet(_REMOTE, '/%s/%s' % ('studies', modifyResponse['ID'])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6585 self.assertEqual('Test', modifiedStudy['PatientMainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6586 patient = DoGet(_REMOTE, '/%s/%s' % ('patients', patientOrthancId)) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6587 # make sure tha patient name remains the same at patient level |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6588 self.assertEqual('Test', patient['MainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6589 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6590 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6591 if True: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6592 # try to edit patient in Knee (only study from this patient) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6593 DropOrthanc(_REMOTE) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6594 UploadFolder(_REMOTE, 'PatientWith2studies') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6595 UploadFolder(_REMOTE, 'Knee/T1') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6596 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6597 kneeStudy = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6598 originalKneePatientId = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6599 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6600 originalKneePatient = DoGet(_REMOTE, '/%s/%s' % ('patients', originalKneePatientId)) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6601 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6602 # try to change the PatientName and StudyDescription at study level. |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6603 modifyResponse = DoPost(_REMOTE, '/%s/%s/modify' % ('studies', kneeStudy), { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6604 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6605 'PatientName': 'Test Knee', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6606 'StudyDescription': 'Knee study' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6607 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6608 'Keep': ['StudyInstanceUID'], |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6609 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6610 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6611 }) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6612 modifiedStudy = DoGet(_REMOTE, '/%s/%s' % ('studies', modifyResponse['ID'])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6613 self.assertEqual('Test Knee', modifiedStudy['PatientMainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6614 # reload the patient, it shall have been updated as well (and kept the same ID since we did not change the PatientID) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6615 modifiedPatient = DoGet(_REMOTE, '/%s/%s' % ('patients', originalKneePatientId)) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6616 self.assertEqual('Test Knee', modifiedPatient['MainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6617 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6618 # try to change the PatientID and PatientName and StudyDescription at study level. Since we use a new PatientID, we can modify its name too |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6619 modifyResponse = DoPost(_REMOTE, '/%s/%s/modify' % ('studies', kneeStudy), { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6620 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6621 'PatientName': 'Test Knee 2', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6622 'PatientID': 'TEST_KNEE_2', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6623 'StudyDescription': 'Knee study 2' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6624 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6625 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6626 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6627 }) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6628 modifiedStudy = DoGet(_REMOTE, '/%s/%s' % ('studies', modifyResponse['ID'])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6629 self.assertEqual('Test Knee 2', modifiedStudy['PatientMainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6630 self.assertEqual('Knee study 2', modifiedStudy['MainDicomTags']['StudyDescription']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6631 # reload the patient, now, its orthanc id has changed |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6632 modifiedPatient = DoGet(_REMOTE, '/%s/%s' % ('patients', modifiedStudy['ParentPatient'])) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6633 self.assertEqual('Test Knee 2', modifiedPatient['MainDicomTags']['PatientName']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6634 # the previous patient shall not exist anymore |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6635 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/%s/%s' % ('patients', originalKneePatientId))) |
|
498
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6636 |
|
305
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6637 def test_store_peer_transcoding(self): |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6638 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6639 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6640 SYNTAXES = [ |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6641 '1.2.840.10008.1.2', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6642 '1.2.840.10008.1.2.1', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6643 #'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
|
6644 '1.2.840.10008.1.2.2', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6645 '1.2.840.10008.1.2.4.50', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6646 '1.2.840.10008.1.2.4.51', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6647 '1.2.840.10008.1.2.4.57', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6648 '1.2.840.10008.1.2.4.70', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6649 ] |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6650 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6651 if HasGdcmPlugin(_REMOTE): |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6652 SYNTAXES = SYNTAXES + [ |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6653 '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
|
6654 '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
|
6655 '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
|
6656 '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
|
6657 ] |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6658 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6659 for syntax in SYNTAXES: |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6660 body = { |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6661 'Resources' : [ i ], |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6662 } |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6663 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6664 if syntax != '1.2.840.10008.1.2.1': |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6665 body['Transcode'] = syntax |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6666 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6667 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6668 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6669 DoPost(_REMOTE, '/peers/peer/store', body, 'text/plain') |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6670 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6671 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6672 self.assertEqual(syntax, GetTransferSyntax( |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6673 DoGet(_LOCAL, '/instances/%s/file' % DoGet(_LOCAL, '/instances') [0]))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6674 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6675 DropOrthanc(_LOCAL) |
| 308 | 6676 |
| 6677 | |
| 295 | 6678 def test_getscu(self): |
| 307 | 6679 def CleanTarget(): |
| 6680 if os.path.isdir('/tmp/GETSCU'): | |
| 6681 shutil.rmtree('/tmp/GETSCU') | |
| 6682 os.makedirs('/tmp/GETSCU') | |
| 6683 | |
|
306
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6684 env = {} |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6685 if _DOCKER: |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6686 # 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
|
6687 # and running in a GNU/Linux distribution running DCMTK |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6688 # 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
|
6689 env['DCMDICTPATH'] = '/usr/share/libdcmtk2/dicom.dic' |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6690 |
| 295 | 6691 # no transcoding required |
| 307 | 6692 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] |
| 6693 | |
| 6694 CleanTarget() | |
| 295 | 6695 |
|
306
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6696 subprocess.check_call([ |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6697 FindExecutable('getscu'), |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6698 _REMOTE['Server'], |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6699 str(_REMOTE['DicomPort']), |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6700 '-aec', 'ORTHANC', |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6701 '-aet', 'ORTHANCTEST', # pretend to be the other orthanc |
| 307 | 6702 '-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
|
6703 '-k', '0008,0052=STUDY', |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6704 '--output-directory', '/tmp/GETSCU/' |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
6705 ], env = env) |
| 295 | 6706 |
| 311 | 6707 f1 = '/tmp/GETSCU/MR.1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549' |
| 6708 self.assertTrue(os.path.isfile(f1)) | |
| 6709 with open(f1, 'rb') as f: | |
| 6710 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(f.read())) | |
| 6711 | |
| 307 | 6712 CleanTarget() |
| 295 | 6713 |
| 6714 # transcoding required | |
| 311 | 6715 UploadInstance(_REMOTE, 'TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm') |
| 307 | 6716 |
| 6717 subprocess.check_call([ | |
| 6718 FindExecutable('getscu'), | |
| 6719 _REMOTE['Server'], | |
| 6720 str(_REMOTE['DicomPort']), | |
| 6721 '-aec', 'ORTHANC', | |
| 6722 '-aet', 'ORTHANCTEST', # pretend to be the other orthanc | |
| 311 | 6723 '-k', '0020,000d=2.16.840.1.113669.632.20.1211.10000357775\\1.2.840.113663.1298.6234813.1.298.20000329.1115122', |
| 307 | 6724 '-k', '0008,0052=STUDY', |
| 6725 '--output-directory', '/tmp/GETSCU/' | |
| 6726 ], env = env) | |
| 6727 | |
| 311 | 6728 self.assertTrue(os.path.isfile(f1)) |
| 6729 with open(f1, 'rb') as f: | |
| 6730 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(f.read())) | |
| 6731 | |
| 6732 # This file is transcoded from "1.2.840.10008.1.2.4.50" to "1.2.840.10008.1.2.1" | |
| 6733 # (LittleEndianExplicit is proposed by default by "getscu") | |
| 6734 f2 = '/tmp/GETSCU/US.1.2.840.113663.1298.1.3.715.20000329.1115326' | |
| 6735 self.assertTrue(os.path.isfile(f2)) | |
| 6736 with open(f2, 'rb') as f: | |
| 6737 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
|
6738 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6739 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6740 def test_findscu_truncation(self): |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6741 # https://groups.google.com/forum/#!msg/orthanc-users/FkckWAHvso8/UbRBAhQ5CwAJ |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6742 # Fixed by: https://hg.orthanc-server.com/orthanc/rev/2724977419fb |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6743 UploadInstance(_REMOTE, 'Multiframe.dcm') |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6744 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6745 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6746 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
|
6747 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6748 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyInstanceUID' ]) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6749 result = re.findall('\(0020,000d\).*?\[(.*?)\]', i) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6750 self.assertEqual(2, len(result)) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6751 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6752 # 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
|
6753 # study, leading to a string of 249 characters |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6754 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6755 'StudyInstanceUID=%s\\%s\\%s\\%s\\%s' % (( study, ) * 5) ]) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6756 result = re.findall('\(0020,000d\).*?\[(.*?)\]', i) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6757 self.assertEqual(1, len(result)) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6758 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6759 # 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
|
6760 # study, leading to a string of 299 characters. In Orthanc <= |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6761 # 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
|
6762 # == 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
|
6763 # 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
|
6764 # "StudyInstanceUID" and returns all the available |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6765 # 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
|
6766 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6767 'StudyInstanceUID=%s\\%s\\%s\\%s\\%s\\%s' % (( study, ) * 6) ]) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6768 result = re.findall('\(0020,000d\).*?\[(.*?)\]', i) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6769 self.assertEqual(1, len(result)) |
|
328
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6770 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6771 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6772 def test_store_compressed(self): |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6773 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f: |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6774 dicom = f.read() |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6775 i = DoPost(_REMOTE, '/instances', dicom) ['ID'] |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6776 sourceSize = len(dicom) |
|
324
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
6777 |
|
328
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6778 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6779 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6780 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6781 # 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
|
6782 jobId = MonitorJob2(_REMOTE, lambda: DoPost( |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6783 _REMOTE, '/peers/peer/store', { |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6784 'Resources' : [ i ], |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6785 'Synchronous' : False, |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6786 })) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6787 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6788 job = DoGet(_REMOTE, '/jobs/%s' % jobId) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6789 self.assertFalse(job['Content']['Compress']) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6790 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
|
6791 self.assertEqual(str(sourceSize), job['Content']['Size']) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6792 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6793 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6794 DropOrthanc(_LOCAL) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6795 |
|
509
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6796 if not IsOrthancVersionAbove(_LOCAL, 1, 11, 2): # don't know which specific version the behaviour changed but this fails with 0.8.6 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6797 # Sending to the local Orthanc 0.8.6 server, with compression: |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6798 # Not supported by Orthanc 0.8.6 => failure |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6799 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/peers/peer/store', { |
|
328
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6800 'Resources' : [ i ], |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6801 'Compress' : True, |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
6802 })) |
|
509
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6803 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6804 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6805 # Sending to the tested remote server, with compression: OK |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6806 jobId = MonitorJob2(_REMOTE, lambda: DoPost( |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6807 _REMOTE, '/peers/self/store', { |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6808 'Resources' : [ i ], |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6809 'Compress' : True, |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6810 'Synchronous' : False, |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6811 })) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6812 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6813 job = DoGet(_REMOTE, '/jobs/%s' % jobId) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6814 self.assertTrue(job['Content']['Compress']) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6815 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6816 # Compression must have divided the size of the sent data at least twice |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6817 self.assertLess(int(job['Content']['Size']), sourceSize / 2) |
| 332 | 6818 |
| 6819 | |
| 6820 def test_move_ambra(self): | |
| 6821 # "Orthanc + Ambra: Query/Retrieve" (2020-08-25) | |
| 6822 # https://groups.google.com/g/orthanc-users/c/yIUnZ9v9-Zs/m/GQPXiAOiCQAJ | |
| 6823 | |
| 6824 UploadInstance(_REMOTE, '2019-06-17-VedranZdesic.dcm') | |
| 6825 | |
| 6826 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 6827 '--study', | |
| 6828 '-k', 'StudyInstanceUID=' | |
| 6829 ]))) | |
| 6830 | |
| 6831 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 6832 '--study', | |
| 6833 '-k', 'AccessionNumber=', | |
| 6834 ]))) | |
| 6835 | |
| 6836 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 6837 '--study', | |
| 6838 '-k', 'AccessionNumber=', | |
| 6839 '-k', 'StudyInstanceUID=' | |
| 6840 ]))) | |
| 6841 | |
| 6842 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 6843 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 6844 '--study', | |
| 6845 '-k', 'AccessionNumber=CT16000988', | |
| 6846 '-k', 'StudyInstanceUID=', | |
| 6847 ]))) | |
| 6848 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 6849 DropOrthanc(_LOCAL) | |
| 6850 | |
| 6851 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 6852 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 6853 '--study', | |
| 6854 '-k', 'AccessionNumber=CT16000988', | |
| 6855 '-k', 'StudyInstanceUID=1.2.840.113619.2.278.3.4194965761.659.1468842739.39', | |
| 6856 ]))) | |
| 6857 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 6858 DropOrthanc(_LOCAL) | |
| 6859 | |
| 6860 # This fails on Orthanc <= 1.7.3 | |
| 6861 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 6862 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 6863 '--study', | |
| 6864 '-k', 'AccessionNumber=', | |
| 6865 '-k', 'StudyInstanceUID=1.2.840.113619.2.278.3.4194965761.659.1468842739.39' | |
| 6866 ]))) | |
| 6867 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 6868 DropOrthanc(_LOCAL) | |
|
333
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6869 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6870 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6871 def test_decode_elscint(self): |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6872 # 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
|
6873 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
|
6874 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
|
6875 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6876 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % a) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6877 self.assertEqual("L", im.mode) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6878 self.assertEqual(512, im.size[0]) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6879 self.assertEqual(512, im.size[1]) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6880 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6881 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % b) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6882 self.assertEqual("L", im.mode) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6883 self.assertEqual(512, im.size[0]) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6884 self.assertEqual(512, im.size[1]) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6885 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6886 # The two tests below fail on Orthanc <= 1.7.3 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6887 raw = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % a) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6888 self.assertEqual(512 * 512 * 2, len(raw)) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6889 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6890 raw = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % b) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6891 self.assertEqual(512 * 512 * 2, len(raw)) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
6892 |
|
334
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
6893 |
|
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
6894 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
|
6895 # 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
|
6896 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
|
6897 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
|
6898 |
|
335
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6899 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
|
6900 modalitiesInStudy = re.findall('\(0008,0061\).*?\[(.*?)\]', i) |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6901 self.assertEqual(1, len(modalitiesInStudy)) |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6902 self.assertEqual('CT\\PT ', modalitiesInStudy[0]) |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6903 |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6904 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
|
6905 # 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
|
6906 # 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
|
6907 |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6908 if i in [ 'UX', 'UX\\MR' ]: |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6909 expected = 0 |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6910 else: |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6911 expected = 1 |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6912 |
|
334
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
6913 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
6914 'Query' : { 'ModalitiesInStudy' : i }}) |
|
335
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
6915 self.assertEqual(expected, len(a)) |
|
334
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
6916 |
|
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
6917 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
|
6918 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
|
6919 self.assertEqual(expected, len(studyInstanceUid)) |
|
337
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
6920 |
|
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
6921 |
|
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
6922 def test_webdav(self): |
|
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
6923 self.assertRaises(Exception, lambda: DoPropFind(_REMOTE, '/webdav/', 2)) |
|
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
6924 |
|
342
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6925 for suffix in [ '', '/' ]: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6926 f = DoPropFind(_REMOTE, '/webdav' + suffix, 0) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6927 self.assertEqual(1, len(f)) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6928 self.assertTrue('/webdav/' in f.keys()) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6929 self.assertTrue(f['/webdav/']['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6930 self.assertEqual('webdav', f['/webdav/']['displayname']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6931 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6932 f = DoPropFind(_REMOTE, '/webdav' + suffix, 1) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6933 self.assertEqual(6, len(f)) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6934 self.assertTrue(f['/webdav/']['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6935 self.assertEqual('webdav', f['/webdav/']['displayname']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6936 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6937 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
|
6938 self.assertTrue(f['/webdav/%s' % i]['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6939 self.assertEqual(i, f['/webdav/%s' % i]['displayname']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6940 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6941 for depth in [ 0, 1 ]: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6942 for suffix2 in [ '', '/' ]: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6943 g = DoPropFind(_REMOTE, '/webdav/%s%s' % (i, suffix2), depth) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6944 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6945 if i == 'uploads': |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6946 # Empty folders might still exist in "/uploads/" |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6947 self.assertTrue('/webdav/uploads/' in g) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6948 self.assertEqual('uploads', g['/webdav/uploads/']['displayname']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6949 for j in g.items(): |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6950 self.assertTrue(g.items()[0][1]['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6951 else: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6952 self.assertEqual(1, len(g)) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6953 self.assertEqual('/webdav/%s/' % i, g.items()[0][0]) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6954 self.assertTrue(g.items()[0][1]['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6955 self.assertEqual(i, g.items()[0][1]['displayname']) |
|
341
66a36befb208
extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
337
diff
changeset
|
6956 |
|
342
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6957 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6958 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6959 DoPut(_REMOTE, '/webdav/uploads/dummy', f.read(), 'text/plain') |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6960 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6961 while len(DoGet(_REMOTE, '/patients')) == 0: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6962 time.sleep(0.01) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6963 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
337
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
6964 |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6965 |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6966 def test_log_categories(self): |
| 350 | 6967 original = DoGet(_REMOTE, '/tools/log-level-http') |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6968 |
| 350 | 6969 DoPut(_REMOTE, '/tools/log-level-http', 'default') |
| 6970 self.assertEqual('default', DoGet(_REMOTE, '/tools/log-level-http')) | |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6971 DoGet(_REMOTE, '/system') |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6972 |
| 350 | 6973 DoPut(_REMOTE, '/tools/log-level-http', 'verbose') |
| 6974 self.assertEqual('verbose', DoGet(_REMOTE, '/tools/log-level-http')) | |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6975 DoGet(_REMOTE, '/system') |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6976 |
| 350 | 6977 DoPut(_REMOTE, '/tools/log-level-http', 'trace') |
| 6978 self.assertEqual('trace', DoGet(_REMOTE, '/tools/log-level-http')) | |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6979 DoGet(_REMOTE, '/system') |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6980 |
| 350 | 6981 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
|
6982 |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6983 # Switch back to the original log level |
| 350 | 6984 DoPut(_REMOTE, '/tools/log-level-http', original) |
| 6985 | |
| 6986 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
|
6987 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
|
6988 |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
6989 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/log-level-nope', 'default')) |
| 357 | 6990 |
| 6991 | |
| 6992 def test_upload_zip(self): | |
| 6993 f = StringIO() | |
| 6994 with zipfile.ZipFile(f, 'w') as z: | |
| 6995 z.writestr('hello/world/invalid.txt', 'Hello world') | |
| 6996 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as g: | |
| 6997 c = g.read() | |
| 6998 z.writestr('hello/world/dicom1.dcm', c) | |
| 6999 z.writestr('hello/world/dicom2.dcm', c) | |
| 7000 | |
| 7001 f.seek(0) | |
| 7002 i = DoPost(_REMOTE, '/instances', f.read()) | |
| 7003 | |
| 7004 self.assertEqual(2, len(i)) | |
| 7005 self.assertEqual(i[0], i[1]) | |
| 7006 self.assertEqual(6, len(i[0])) | |
| 7007 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', i[0]['ID']) | |
| 7008 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', i[0]['ParentSeries']) | |
| 7009 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', i[0]['ParentStudy']) | |
| 7010 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', i[0]['ParentPatient']) | |
| 7011 self.assertEqual('/instances/66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', i[0]['Path']) | |
| 7012 | |
| 7013 # Both are "Success" (instead of one "AlreadyStored"), because "OverwriteInstance" is true | |
| 7014 self.assertEqual('Success', i[0]['Status']) | |
|
361
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7015 |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7016 |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7017 def test_transfer_syntax_no_metaheader(self): |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7018 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
|
7019 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % a) |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7020 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
|
7021 |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7022 # This fails on Orthanc <= 1.8.1 |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7023 self.assertTrue('TransferSyntax' in m) |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7024 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
|
7025 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7026 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7027 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
|
7028 # 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
|
7029 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7030 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
|
7031 return (('--%s\r\n' + |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7032 '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
|
7033 '\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
|
7034 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7035 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
|
7036 dcm1 = f.read() |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7037 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7038 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
|
7039 dcm2 = f.read() |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7040 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7041 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
|
7042 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7043 boundary = '----WebKitFormBoundarypJDNQqJPoXiorRmQ' |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7044 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
|
7045 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
|
7046 '--' + boundary + '--'), headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7047 '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
|
7048 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7049 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7050 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7051 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
|
7052 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7053 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7054 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
|
7055 # 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
|
7056 # 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
|
7057 # "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
|
7058 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7059 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
|
7060 return (('--%s\r\n' + |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7061 '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
|
7062 '\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
|
7063 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7064 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
|
7065 dcm = f.read() |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7066 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7067 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
|
7068 dcm2 = f.read() |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7069 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7070 boundary = '----WebKitFormBoundarypJDNQqJPoXiorRmQ' |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7071 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7072 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
|
7073 m = DoPost(_REMOTE, '/instances', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7074 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
|
7075 headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7076 '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
|
7077 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7078 '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
|
7079 '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
|
7080 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7081 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7082 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
|
7083 m = DoPost(_REMOTE, '/instances', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7084 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
|
7085 headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7086 '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
|
7087 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7088 '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
|
7089 '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
|
7090 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7091 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
|
7092 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7093 m = DoPost(_REMOTE, '/instances', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7094 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
|
7095 headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7096 '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
|
7097 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7098 '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
|
7099 '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
|
7100 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7101 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7102 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
|
7103 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7104 # 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
|
7105 m = DoPost(_REMOTE, '/instances', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7106 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
|
7107 headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7108 '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
|
7109 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7110 '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
|
7111 '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
|
7112 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7113 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7114 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
377
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7115 |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7116 |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7117 def test_pixel_data_offset(self): |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7118 # New in Orthanc 1.9.1 |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7119 def Check(path, offset): |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7120 i = UploadInstance(_REMOTE, path) ['ID'] |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7121 metadata = DoGetRaw(_REMOTE, '/instances/%s/metadata/PixelDataOffset' % i) [1] |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7122 self.assertEqual(offset, metadata) |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7123 |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7124 Check('ColorTestMalaterre.dcm', str(0x03a0)) |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7125 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
|
7126 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
|
7127 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
|
7128 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
|
7129 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
|
7130 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
|
7131 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
|
7132 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
|
7133 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
|
7134 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
|
7135 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
|
7136 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
|
7137 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7138 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7139 def test_peer_store_straight(self): |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7140 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports'])) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7141 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7142 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7143 peer = DoGet(_REMOTE, '/peers/peer/system') |
|
509
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
7144 if not IsOrthancVersionAbove(_LOCAL, 0, 8, 6): |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
7145 self.assertEqual(3, len(peer)) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
7146 self.assertEqual(5, peer['DatabaseVersion']) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
7147 self.assertEqual('MyOrthanc', peer['Name']) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
7148 self.assertEqual('0.8.6', peer['Version']) |
|
382
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7149 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7150 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f: |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7151 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
|
7152 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7153 # 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
|
7154 # "ParentStudy", "ParentSeries" are not reported |
|
509
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
7155 if not IsOrthancVersionAbove(_LOCAL, 1, 11, 2): # don't know which specific version the behaviour changed but this fails with 0.8.6 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
7156 self.assertEqual(3, len(j)) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
7157 else: |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
7158 self.assertEqual(6, len(j)) |
|
382
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7159 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
|
7160 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
|
7161 self.assertEqual('Success', j['Status']) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7162 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7163 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7164 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
| 383 | 7165 |
| 7166 | |
| 7167 def test_cp246(self): | |
| 7168 # This fails on Orthanc <= 1.9.0 | |
| 7169 a = UploadInstance(_REMOTE, '2021-02-19-MalaterreCP246.dcm')['ID'] | |
| 7170 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 7171 | |
| 7172 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % a) | |
| 7173 self.assertEqual('1.2.840.10008.5.1.4.1.1.128', tags['0008,0016']) | |
| 7174 self.assertEqual('1.3.12.2.1107.5.1.4.36085.2.0.517715415141633', tags['0008,0018']) | |
| 7175 self.assertEqual('1.2.840.113745.101000.1008000.38179.6792.6324567', tags['0020,000d']) | |
| 7176 self.assertEqual('1.3.12.2.1107.5.1.4.36085.2.0.517714246252254', tags['0020,000e']) | |
| 7177 | |
| 7178 study = DoGet(_REMOTE, '/instances/%s/study' % a) | |
| 7179 self.assertEqual(tags['0020,000d'], study['MainDicomTags']['StudyInstanceUID']) | |
| 7180 | |
| 7181 series = DoGet(_REMOTE, '/instances/%s/series' % a) | |
| 7182 self.assertEqual(tags['0020,000e'], series['MainDicomTags']['SeriesInstanceUID']) | |
| 7183 | |
| 7184 instance = DoGet(_REMOTE, '/instances/%s' % a) | |
| 7185 self.assertEqual(tags['0008,0018'], instance['MainDicomTags']['SOPInstanceUID']) | |
| 7186 | |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7187 |
|
392
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
7188 def test_revisions_metadata(self): |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7189 # 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
|
7190 # 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
|
7191 # "CheckRevisions" is "False". Conventions for HTTP headers |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7192 # related to revisions mimic CouchDB: |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7193 # 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
|
7194 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7195 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7196 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7197 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
|
7198 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
|
7199 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
|
7200 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7201 (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
|
7202 '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
|
7203 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7204 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
|
7205 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7206 (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
|
7207 '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
|
7208 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7209 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
|
7210 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7211 (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
|
7212 'If-None-Match' : '"0-16de4d7060d0b9d102ef0fca8acc892a"' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7213 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7214 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
|
7215 self.assertEqual('"0-16de4d7060d0b9d102ef0fca8acc892a"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7216 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
|
7217 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7218 (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
|
7219 '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
|
7220 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7221 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
|
7222 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
|
7223 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
|
7224 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7225 (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
|
7226 '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
|
7227 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7228 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
|
7229 self.assertEqual('"0-16de4d7060d0b9d102ef0fca8acc892a"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7230 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
|
7231 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7232 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7233 self.assertEqual('403', headers['status']) # Forbidden (system metadata) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7234 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7235 (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
|
7236 self.assertEqual('403', headers['status']) # Forbidden (system metadata) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7237 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7238 (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
|
7239 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
|
7240 self.assertEqual('"0-%s"' % ComputeMD5('hello'), headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7241 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7242 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7243 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
|
7244 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7245 self.assertEqual('hello', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7246 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7247 (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
|
7248 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7249 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7250 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
|
7251 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7252 self.assertEqual('', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7253 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7254 (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
|
7255 'If-None-Match' : '"1-tata"' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7256 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7257 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
|
7258 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7259 self.assertEqual('hello', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7260 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
|
7261 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7262 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/1024' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7263 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
|
7264 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7265 (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
|
7266 'If-Match' : '45-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7267 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7268 self.assertEqual('409', headers['status']) # Conflict, as bad revision |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7269 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7270 (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
|
7271 '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
|
7272 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7273 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
|
7274 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7275 (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
|
7276 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7277 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7278 self.assertEqual('200', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7279 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7280 (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
|
7281 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7282 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7283 self.assertEqual('404', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7284 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7285 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7286 self.assertEqual('404', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7287 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7288 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
|
7289 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7290 (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
|
7291 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
|
7292 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7293 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7294 (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
|
7295 self.assertEqual('409', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7296 |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7297 (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
|
7298 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7299 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7300 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
|
7301 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7302 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
|
7303 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7304 (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
|
7305 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7306 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7307 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
|
7308 self.assertEqual('"1-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7309 self.assertEqual('', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7310 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7311 (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
|
7312 'If-None-Match' : headers['etag'] |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7313 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7314 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7315 if headers['status'] == '200': |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7316 print("Your database backend doesn't store revisions") |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7317 (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
|
7318 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7319 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7320 self.assertEqual('409', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7321 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7322 (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
|
7323 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7324 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7325 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
|
7326 self.assertEqual('"1-6e809cbda0732ac4845916a59016f954"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7327 self.assertEqual('', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7328 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7329 elif headers['status'] == '304': # Revisions are supported |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7330 (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
|
7331 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7332 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7333 self.assertEqual('409', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7334 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7335 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/metadata/1024' % i, '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
|
7336 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7337 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7338 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
|
7339 self.assertEqual('"2-6e809cbda0732ac4845916a59016f954"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7340 self.assertEqual('', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7341 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7342 else: |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7343 raise Exception('Internal error') |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7344 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7345 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
|
7346 |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7347 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7348 def test_revisions_attachments(self): |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7349 # 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
|
7350 # was introduced in 1.9.2), or if configuration option |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7351 # "CheckRevisions" is "False". Conventions for HTTP headers |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7352 # related to revisions mimic CouchDB: |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7353 # https://docs.couchdb.org/en/stable/api/document/common.html |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7354 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7355 |
|
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
|
7356 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
|
7357 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
|
7358 |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7359 # "/compress", "/uncompress" and "/verify-md5" are POST |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7360 # methods, and are not affected by revisions |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7361 for suffix in [ '', '/compressed-data', '/compressed-md5', '/compressed-size', |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7362 '/data', '/is-compressed', '/md5', '/size' ]: |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7363 (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
|
7364 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
|
7365 self.assertEqual('"0-%s"' % md5, headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7366 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7367 (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
|
7368 'If-None-Match' : '"0-3e29b869978b6db4886355a2b1132124"', |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7369 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7370 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
|
7371 self.assertEqual('"0-3e29b869978b6db4886355a2b1132124"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7372 self.assertEqual('', body) # Body must be empty on 304 status |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7373 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7374 (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
|
7375 '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
|
7376 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7377 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
|
7378 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7379 (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
|
7380 '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
|
7381 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7382 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
|
7383 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
|
7384 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7385 (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
|
7386 '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
|
7387 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7388 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
|
7389 self.assertEqual('"0-3e29b869978b6db4886355a2b1132124"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7390 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7391 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/dicom' % i) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7392 self.assertEqual('403', headers['status']) # Forbidden (system metadata) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7393 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7394 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/dicom' % i, 'hello') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7395 self.assertEqual('403', headers['status']) # Forbidden (system metadata) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7396 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7397 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7398 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
|
7399 self.assertEqual('"0-%s"' % ComputeMD5('hello'), headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7400 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7401 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7402 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
|
7403 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7404 self.assertEqual('hello', body) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7405 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7406 (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
|
7407 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7408 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7409 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
|
7410 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7411 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
|
7412 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7413 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
|
7414 '"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
|
7415 (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
|
7416 '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
|
7417 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7418 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
|
7419 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
|
7420 self.assertEqual('hello', body) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7421 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7422 (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
|
7423 'If-None-Match' : 'tata' # Bad header format |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7424 }) |
|
397
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7425 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
|
7426 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
|
7427 |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7428 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
|
7429 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7430 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/1024' % i) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7431 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
|
7432 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7433 (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
|
7434 'If-Match' : '45-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7435 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7436 self.assertEqual('409', headers['status']) # Conflict, as bad revision |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7437 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7438 (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
|
7439 '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
|
7440 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7441 self.assertEqual('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
|
7442 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7443 (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
|
7444 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7445 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7446 self.assertEqual('200', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7447 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7448 (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
|
7449 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7450 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7451 self.assertEqual('404', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7452 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7453 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7454 self.assertEqual('404', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7455 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7456 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
|
7457 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7458 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7459 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
|
7460 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7461 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7462 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7463 self.assertEqual('409', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7464 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7465 (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
|
7466 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7467 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7468 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
|
7469 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7470 self.assertEqual('', body) # Body must be empty on 304 status |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7471 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7472 (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
|
7473 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7474 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7475 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
|
7476 self.assertEqual('"1-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7477 self.assertEqual('{}', body) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7478 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7479 (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
|
7480 'If-None-Match' : headers['etag'] |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7481 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7482 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7483 if headers['status'] == '200': |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7484 print("Your database backend doesn't store revisions") |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7485 (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
|
7486 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7487 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7488 self.assertEqual('409', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7489 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7490 (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
|
7491 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7492 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7493 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
|
7494 self.assertEqual('"1-6e809cbda0732ac4845916a59016f954"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7495 self.assertEqual('{}', body) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7496 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7497 elif headers['status'] == '304': # Revisions are supported |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7498 (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
|
7499 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7500 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7501 self.assertEqual('409', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7502 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7503 (headers, body) = 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
|
7504 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7505 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7506 self.assertEqual('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
|
7507 self.assertEqual('"2-6e809cbda0732ac4845916a59016f954"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7508 self.assertEqual('{}', body) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7509 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7510 else: |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7511 raise Exception('Internal error') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7512 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7513 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
|
7514 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7515 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7516 def test_issue_195(self): |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7517 # This fails on Orthanc <= 1.9.2 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7518 # 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
|
7519 a = UploadInstance(_REMOTE, 'Issue195.dcm')['ID'] |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7520 b = DoGet(_REMOTE, '/instances/%s/file' % a, |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7521 headers = { 'Accept' : 'application/dicom+json' }) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7522 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7523 # 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
|
7524 self.assertEqual(5, len(b)) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7525 self.assertEqual(2, len(b["00080018"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7526 self.assertEqual("UI", b["00080018"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7527 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
|
7528 b["00080018"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7529 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7530 self.assertEqual(2, len(b["0020000D"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7531 self.assertEqual("UI", b["0020000D"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7532 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
|
7533 b["0020000D"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7534 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7535 self.assertEqual(2, len(b["0020000E"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7536 self.assertEqual("UI", b["0020000E"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7537 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
|
7538 b["0020000E"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7539 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7540 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
|
7541 self.assertEqual("LO", b["00081030"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7542 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7543 self.assertEqual(2, len(b["0008103E"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7544 self.assertEqual("LO", b["0008103E"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7545 self.assertEqual("Hello1", b["0008103E"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7546 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7547 a = UploadInstance(_REMOTE, 'Issue195-bis.dcm')['ID'] |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7548 b = DoGet(_REMOTE, '/instances/%s/file' % a, |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7549 headers = { 'Accept' : 'application/dicom+json' }) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7550 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7551 # 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
|
7552 self.assertEqual(5, len(b)) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7553 self.assertEqual(2, len(b["00080018"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7554 self.assertEqual("UI", b["00080018"]["vr"]) |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7555 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
|
7556 b["00080018"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7557 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7558 self.assertEqual(2, len(b["0020000D"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7559 self.assertEqual("UI", b["0020000D"]["vr"]) |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7560 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
|
7561 b["0020000D"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7562 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7563 self.assertEqual(2, len(b["0020000E"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7564 self.assertEqual("UI", b["0020000E"]["vr"]) |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7565 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
|
7566 b["0020000E"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7567 |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7568 self.assertEqual(2, len(b["00084567"])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7569 self.assertEqual("UN", b["00084567"]["vr"]) |
|
399
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7570 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7571 # 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
|
7572 # $ echo -n 'QgA=' | base64 -d | hexdump -C |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7573 self.assertEqual("QgA=", b["00084567"]["InlineBinary"]) |
|
399
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7574 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7575 # 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
|
7576 self.assertEqual(1, len(b["00084565"])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7577 self.assertEqual("UN", b["00084565"]["vr"]) |
|
402
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7578 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7579 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7580 def test_modify_attribute(self): |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7581 # This fails on Orthanc <= 1.9.3 (not implemented) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7582 # 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
|
7583 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7584 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7585 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % i) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7586 self.assertFalse('0020,9165' in tags) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7587 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7588 i = DoPost(_REMOTE, '/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0/modify', { |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7589 "Replace": { |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7590 "0020,9165": "0020,9056", |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7591 } |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7592 }) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7593 instances = DoGet(_REMOTE, '/studies/%s/instances' % i['ID']) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7594 self.assertEqual(1, len(instances)) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7595 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7596 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % instances[0]['ID']) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7597 self.assertTrue('0020,9165' in tags) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
7598 self.assertEqual('0020,9056', tags['0020,9165']) |
| 405 | 7599 |
| 7600 | |
| 7601 def test_issue_146(self): | |
| 7602 # "Update Anonyization to 2019c" | |
| 7603 # https://bugs.orthanc-server.com/show_bug.cgi?id=146 | |
| 7604 | |
| 7605 def GetTags(study, params): | |
| 7606 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, params) ['ID'] | |
| 7607 b = DoGet(_REMOTE, '/studies/%s/instances' % a) | |
| 7608 self.assertEqual(1, len(b)) | |
| 7609 return DoGet(_REMOTE, '/instances/%s/tags?short' % b[0]['ID']) | |
| 7610 | |
| 7611 | |
| 7612 UploadInstance(_REMOTE, 'Issue146.dcm') | |
| 7613 study = '7c950970-321e4ab0-28446c5f-f94850f1-5c44634b' | |
| 7614 | |
| 7615 self.assertRaises(Exception, lambda: GetTags(study, { 'DicomVersion' : 'nope' })) | |
| 7616 | |
| 7617 tags2008 = GetTags(study, { 'DicomVersion' : '2008' }) | |
| 7618 tags2017c = GetTags(study, { 'DicomVersion' : '2017c' }) | |
| 7619 tags2021b = GetTags(study, { 'DicomVersion' : '2021b' }) | |
| 7620 tagsDefault = GetTags(study, {}) | |
| 7621 | |
| 420 | 7622 orthancVersion = DoGet(_REMOTE, '/system') ['Version'] |
| 7623 self.assertEqual('Orthanc %s - PS 3.15-2008 Table E.1-1' % orthancVersion, tags2008['0012,0063']) | |
| 7624 self.assertEqual('Orthanc %s - PS 3.15-2017c Table E.1-1 Basic Profile' % orthancVersion, tags2017c['0012,0063']) | |
| 7625 self.assertEqual('Orthanc %s - PS 3.15-2021b Table E.1-1 Basic Profile' % orthancVersion, tags2021b['0012,0063']) | |
| 405 | 7626 self.assertEqual(tagsDefault['0012,0063'], tags2021b['0012,0063']) |
| 7627 | |
| 7628 for t in [ tags2008, tags2017c, tags2021b, tagsDefault ]: | |
| 7629 self.assertTrue(t['0010,0010'].startswith('Anonymized')) | |
| 7630 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', t['0008,0016']) | |
| 7631 self.assertEqual(36, len(t['0010,0020'])) # Length of a UUID | |
| 7632 self.assertEqual('YES', t['0012,0062']) | |
| 7633 | |
| 7634 for t in [ tags2008 ]: | |
| 7635 self.assertEqual('20200101', t['0008,0020']) | |
| 7636 | |
| 7637 for t in [ tags2017c, tags2021b, tagsDefault ]: | |
| 7638 self.assertEqual('', t['0008,0020']) # Study Date, anonymized between 2008 and 2017c | |
| 7639 | |
| 7640 for t in [ tags2008, tags2017c ]: | |
| 7641 self.assertEqual('HELLO^C', t['0050,0020']) | |
| 7642 self.assertEqual('HELLO^D', t['3006,0002']) | |
| 7643 | |
| 7644 for t in [ tags2021b, tagsDefault ]: | |
| 7645 self.assertFalse('0050,0020' in t) # Device Description, anonymized between 2017c and 2019c | |
| 7646 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
|
7647 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7648 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7649 def test_anonymize_relationships_6(self): |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7650 # 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
|
7651 # 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
|
7652 # sequence containing StudyUID / Series UID of related series. |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7653 # [After anonymization,] this tag keep a reference of the |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7654 # original Study/Series UID. |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7655 # 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
|
7656 UploadInstance(_REMOTE, '2020-11-16-SalimKanounAnonymization.dcm') |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7657 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7658 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
|
7659 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
|
7660 tags['0008,1250'][0]['0020,000d']) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7661 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
|
7662 tags['0008,1250'][0]['0020,000e']) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7663 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7664 a = DoGet(_REMOTE, '/studies') |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7665 self.assertEqual(1, len(a)) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7666 b = DoPost(_REMOTE, '/studies/%s/anonymize' % a[0], {}) ['ID'] |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7667 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7668 c = DoGet(_REMOTE, '/studies/%s/instances' % b) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7669 self.assertEqual(1, len(c)) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7670 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
|
7671 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7672 # 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
|
7673 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
|
7674 tags['0008,1250'][0]['0020,000d']) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
7675 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
|
7676 tags['0008,1250'][0]['0020,000e']) |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7677 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7678 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7679 def test_modify_subsequences(self): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7680 # New in Orthanc 1.9.4 (cf. LSD-629) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7681 UploadInstance(_REMOTE, 'Issue22-NoPixelData.dcm') |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7682 studies = DoGet(_REMOTE, '/studies') |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7683 self.assertEqual(1, len(studies)) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7684 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7685 def GetTags(study): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7686 instances = DoGet(_REMOTE, '/studies/%s/instances' % study) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7687 self.assertEqual(1, len(instances)) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7688 return DoGet(_REMOTE, '/instances/%s/tags?short' % instances[0]['ID']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7689 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7690 tags1 = GetTags(studies[0]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7691 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7692 a = DoPost(_REMOTE, '/studies/%s/modify' % studies[0], { |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7693 'Replace' : { |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7694 'PatientName' : 'Hello1', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7695 'DimensionIndexSequence[1].DimensionDescriptionLabel' : 'Hello2', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7696 'DimensionIndexSequence[*].PatientName' : 'Hello3', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7697 '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
|
7698 'DimensionOrganizationSequence[0].DimensionOrganizationUID' : '1.2.3.4', |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7699 }, |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7700 'Remove' : [ |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7701 'ReferencedPerformedProcedureStepSequence', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7702 'PerformedProtocolCodeSequence[0].CodeValue', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7703 'SharedFunctionalGroupsSequence[*].ReferencedImageSequence[*].ReferencedSOPInstanceUID', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7704 'SharedFunctionalGroupsSequence[*].ReferencedImageSequence[1].ReferencedSOPClassUID', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7705 'SharedFunctionalGroupsSequence[2].ReferencedImageSequence', # Inexistent tag |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7706 ] |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7707 }) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7708 tags2 = GetTags(a['ID']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7709 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7710 self.assertEqual('Anonymized1', tags1['0010,0010']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7711 self.assertEqual('Hello1', tags2['0010,0010']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7712 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7713 self.assertEqual('Stack ID', tags1['0020,9222'][0]['0020,9421']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7714 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
|
7715 self.assertEqual('Stack ID', tags2['0020,9222'][0]['0020,9421']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7716 self.assertEqual('Hello2', tags2['0020,9222'][1]['0020,9421']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7717 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7718 for i in range(3): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7719 self.assertFalse('0010,0010' in tags1['0020,9222'][i]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7720 self.assertEqual('Hello3', tags2['0020,9222'][i]['0010,0010']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7721 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7722 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
|
7723 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
|
7724 self.assertEqual('Hello4', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7725 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
|
7726 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
|
7727 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
|
7728 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7729 self.assertTrue('0008,1111' in tags1) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7730 self.assertFalse('0008,1111' in tags2) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7731 self.assertTrue('0008,0100' in tags1['0040,0260'][0]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7732 self.assertFalse('0008,0100' in tags2['0040,0260'][0]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7733 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7734 for i in range(3): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7735 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
|
7736 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
|
7737 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
|
7738 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7739 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
|
7740 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
|
7741 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
|
7742 |
|
408
4e0b9fddbc71
test "Replace" for UID in subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
7743 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
|
7744 tags1['0020,9221'][0]['0020,9164']) |
|
4e0b9fddbc71
test "Replace" for UID in subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
7745 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
|
7746 |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7747 a = DoPost(_REMOTE, '/studies/%s/anonymize' % studies[0], { |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7748 'Replace' : { |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7749 'DimensionIndexSequence[1].DimensionDescriptionLabel' : 'Hello1', |
|
408
4e0b9fddbc71
test "Replace" for UID in subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
7750 'DimensionOrganizationSequence[0].DimensionOrganizationUID' : '1.2.3.4', |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7751 }, |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7752 'Remove' : [ |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7753 'SharedFunctionalGroupsSequence[*].ReferencedImageSequence[*].ReferencedSOPInstanceUID', # 5200,9229 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7754 ], |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7755 'Keep' : [ |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7756 'ReferencedImageEvidenceSequence', # 0008,9092 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7757 'DimensionIndexSequence', # 0020,9222 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7758 'PerFrameFunctionalGroupsSequence[*].2005,140f[*].SOPInstanceUID', # 5200,9230 |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7759 '(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
|
7760 '(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
|
7761 ], |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
7762 'KeepPrivateTags' : True # Compatibility with Orthanc 1.9.4 |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7763 }) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7764 tags3 = GetTags(a['ID']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7765 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7766 # UIDs |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7767 for i in [ '0008,0018', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7768 '0010,0020', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7769 '0008,0018', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7770 '0010,0020' ]: |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7771 self.assertNotEqual(tags1[i], tags3[i]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7772 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7773 self.assertNotEqual(tags1['0020,9221'][0]['0020,9164'], |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7774 tags3['0020,9221'][0]['0020,9164']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7775 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7776 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
|
7777 tags3['5200,9229'][0]['2005,140e'][0]['0008,0014']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7778 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7779 # 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
|
7780 # Removals (X) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7781 for i in [ '0008,0021', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7782 '0008,002a', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7783 '0008,0031', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7784 '0008,1030', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7785 '0008,103e', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7786 '0008,1111', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7787 '0010,21c0', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7788 '0040,0006', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7789 '0040,0241', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7790 '0040,0244', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7791 '0040,0245', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7792 '0040,0250', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7793 '0040,0251', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7794 '0040,0253', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7795 '0040,0254', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7796 '0040,0555', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7797 ]: |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7798 self.assertTrue(i in tags1) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7799 self.assertFalse(i in tags3) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7800 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7801 # Clearings (Z) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7802 for i in [ '0008,0020', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7803 '0008,0023', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7804 '0008,0030', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7805 '0008,0033' ]: |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7806 self.assertNotEqual('', tags1[i]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7807 self.assertEqual('', tags3[i]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7808 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7809 # Replace |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7810 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
|
7811 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
|
7812 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
|
7813 |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7814 # "Keep" on DimensionIndexSequence |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7815 for i in range(3): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7816 self.assertEqual(tags1['0020,9222'][i]['0020,9164'], |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7817 tags3['0020,9222'][i]['0020,9164']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7818 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7819 # "Keep" on ReferencedImageEvidenceSequence |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7820 self.assertEqual(json.dumps(tags1['0008,9092']), |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7821 json.dumps(tags3['0008,9092'])) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7822 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7823 # "Keep" on PerFrameFunctionalGroupsSequence |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7824 self.assertEqual(json.dumps(tags1['5200,9230']), |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7825 json.dumps(tags3['5200,9230'])) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7826 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7827 # "Remove" on SharedFunctionalGroupsSequence |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7828 for i in range(3): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
7829 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
|
7830 self.assertFalse('0008,1155' in tags3['5200,9229'][0]['0008,1140'][i]) |
| 410 | 7831 |
| 7832 | |
| 7833 def test_bulk_modify(self): | |
| 7834 # New in Orthanc 1.9.4 | |
| 7835 | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7836 def GetModified(lst, resourceType, expectedCount = None): |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7837 m = map(lambda x: x['ID'], filter(lambda x: x['Type'] == resourceType, lst['Resources'])) |
| 410 | 7838 if expectedCount != None: |
| 7839 self.assertEqual(expectedCount, len(m)) | |
| 7840 return m | |
| 7841 | |
| 7842 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] | |
| 7843 series = DoGet(_REMOTE, '/series') [0] | |
| 7844 study = DoGet(_REMOTE, '/studies') [0] | |
| 7845 patient = DoGet(_REMOTE, '/patients') [0] | |
| 7846 | |
| 7847 a = DoPost(_REMOTE, '/tools/bulk-modify', { | |
| 7848 'Resources' : [ instance ] | |
| 7849 }) | |
| 7850 | |
| 7851 self.assertNotEqual(instance, GetModified(a, 'Instance', 1) [0]) | |
| 7852 self.assertEqual(series, GetModified(a, 'Series', 1) [0]) | |
| 7853 self.assertEqual(study, GetModified(a, 'Study', 1) [0]) | |
| 7854 self.assertEqual(patient, GetModified(a, 'Patient', 1) [0]) | |
| 7855 | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7856 b = DoPost(_REMOTE, '/tools/bulk-anonymize', { |
| 410 | 7857 'Resources' : [ instance ] |
| 7858 }) | |
| 7859 | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7860 self.assertNotEqual(instance, GetModified(b, 'Instance', 1) [0]) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7861 self.assertNotEqual(series, GetModified(b, 'Series', 1) [0]) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7862 self.assertNotEqual(study, GetModified(b, 'Study', 1) [0]) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7863 self.assertNotEqual(patient, GetModified(b, 'Patient', 1) [0]) |
| 410 | 7864 |
| 7865 self.assertEqual(3, len(DoGet(_REMOTE, '/instances'))) | |
| 7866 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 7867 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) | |
| 7868 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7869 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7870 DoPost(_REMOTE, '/tools/bulk-delete', { |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7871 'Resources' : GetModified(b, 'Patient', 1) + GetModified(a, 'Instance', 1) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7872 }) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7873 |
| 410 | 7874 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID'] |
| 7875 knee2 = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') ['ID'] | |
| 7876 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID'] | |
| 7877 | |
| 7878 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) | |
| 7879 self.assertEqual(4, len(DoGet(_REMOTE, '/series'))) | |
| 7880 self.assertEqual(3, len(DoGet(_REMOTE, '/studies'))) | |
| 7881 self.assertEqual(3, len(DoGet(_REMOTE, '/patients'))) | |
| 7882 | |
| 7883 a = DoPost(_REMOTE, '/tools/bulk-modify', { | |
| 7884 'Resources' : [ knee1, brainix ] | |
| 7885 }) | |
| 7886 | |
| 7887 self.assertEqual(6, len(DoGet(_REMOTE, '/instances'))) | |
| 7888 self.assertEqual(4, len(DoGet(_REMOTE, '/series'))) | |
| 7889 self.assertEqual(3, len(DoGet(_REMOTE, '/studies'))) | |
| 7890 self.assertEqual(3, len(DoGet(_REMOTE, '/patients'))) | |
| 7891 | |
| 7892 for i in GetModified(a, 'Instance', 2): | |
| 7893 self.assertTrue(not i in [ instance, knee1, knee2, brainix ]) | |
| 7894 self.assertTrue(DoGet(_REMOTE, '/instances/%s/metadata/ModifiedFrom' % i) in [ knee1, brainix ]) | |
| 7895 | |
| 7896 b = GetModified(a, 'Series', 2) | |
| 7897 self.assertTrue(DoGet(_REMOTE, '/instances/%s/series' % knee1) ['ID'] in b) | |
| 7898 self.assertTrue(DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'] in b) | |
| 7899 self.assertFalse(DoGet(_REMOTE, '/instances/%s/series' % knee2) ['ID'] in b) | |
| 7900 self.assertFalse(DoGet(_REMOTE, '/instances/%s/series' % instance) ['ID'] in b) | |
| 7901 | |
| 7902 b = GetModified(a, 'Study', 2) | |
| 7903 self.assertTrue(DoGet(_REMOTE, '/instances/%s/study' % knee1) ['ID'] in b) | |
| 7904 self.assertTrue(DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID'] in b) | |
| 7905 self.assertTrue(DoGet(_REMOTE, '/instances/%s/study' % knee2) ['ID'] in b) | |
| 7906 self.assertFalse(DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] in b) | |
| 7907 | |
| 7908 b = GetModified(a, 'Patient', 2) | |
| 7909 self.assertTrue(DoGet(_REMOTE, '/instances/%s/patient' % knee1) ['ID'] in b) | |
| 7910 self.assertTrue(DoGet(_REMOTE, '/instances/%s/patient' % brainix) ['ID'] in b) | |
| 7911 self.assertTrue(DoGet(_REMOTE, '/instances/%s/patient' % knee2) ['ID'] in b) | |
| 7912 self.assertFalse(DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] in b) | |
| 7913 | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7914 DoPost(_REMOTE, '/tools/bulk-delete', { |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7915 'Resources' : GetModified(a, 'Instance', 2) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7916 }) |
| 410 | 7917 |
| 7918 sourceInstances = DoGet(_REMOTE, '/instances') | |
| 7919 sourceSeries = DoGet(_REMOTE, '/series') | |
| 7920 sourceStudies = DoGet(_REMOTE, '/studies') | |
| 7921 sourcePatients = DoGet(_REMOTE, '/patients') | |
| 7922 self.assertEqual(4, len(sourceInstances)) | |
| 7923 self.assertEqual(4, len(sourceSeries)) | |
| 7924 self.assertEqual(3, len(sourceStudies)) | |
| 7925 self.assertEqual(3, len(sourcePatients)) | |
| 7926 | |
| 7927 a = DoPost(_REMOTE, '/tools/bulk-anonymize', { | |
| 7928 'Resources' : [ knee1, brainix ] | |
| 7929 }) | |
| 7930 | |
| 7931 self.assertEqual(6, len(DoGet(_REMOTE, '/instances'))) | |
| 7932 self.assertEqual(6, len(DoGet(_REMOTE, '/series'))) | |
| 7933 self.assertEqual(5, len(DoGet(_REMOTE, '/studies'))) | |
| 7934 self.assertEqual(5, len(DoGet(_REMOTE, '/patients'))) | |
| 7935 | |
| 7936 for i in GetModified(a, 'Instance', 2): | |
| 7937 self.assertFalse(i in sourceInstances) | |
| 7938 self.assertTrue(DoGet(_REMOTE, '/instances/%s/metadata/AnonymizedFrom' % i) in [ knee1, brainix ]) | |
| 7939 | |
| 7940 for i in GetModified(a, 'Series', 2): | |
| 7941 self.assertFalse(i in sourceSeries) | |
| 7942 self.assertTrue(DoGet(_REMOTE, '/series/%s/metadata/AnonymizedFrom' % i) in sourceSeries) | |
| 7943 | |
| 7944 for i in GetModified(a, 'Study', 2): | |
| 7945 self.assertFalse(i in sourceStudies) | |
| 7946 self.assertTrue(DoGet(_REMOTE, '/studies/%s/metadata/AnonymizedFrom' % i) in sourceStudies) | |
| 7947 | |
| 7948 for i in GetModified(a, 'Patient', 2): | |
| 7949 self.assertFalse(i in sourcePatients) | |
| 7950 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
|
7951 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7952 DoPost(_REMOTE, '/tools/bulk-delete', { |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7953 'Resources' : GetModified(a, 'Patient', 2) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7954 }) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7955 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7956 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7957 self.assertEqual(4, len(DoGet(_REMOTE, '/series'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7958 self.assertEqual(3, len(DoGet(_REMOTE, '/studies'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7959 self.assertEqual(3, len(DoGet(_REMOTE, '/patients'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7960 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7961 DoPost(_REMOTE, '/tools/bulk-delete', { |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7962 'Resources' : [ instance, |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7963 DoGet(_REMOTE, '/instances/%s/patient' % knee1) ['ID'], |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7964 DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'] ] |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7965 }) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7966 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7967 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7968 self.assertEqual(0, len(DoGet(_REMOTE, '/series'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7969 self.assertEqual(0, len(DoGet(_REMOTE, '/studies'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
7970 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
412
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7971 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7972 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7973 def test_dicom_to_json_format(self): |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7974 # 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
|
7975 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7976 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7977 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7978 series = DoGet(_REMOTE, '/instances/%s/series' % instance) ['ID'] |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7979 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7980 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
|
7981 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
|
7982 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
|
7983 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
|
7984 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
|
7985 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
|
7986 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7987 # Test "GetInstanceHeader()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7988 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
|
7989 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
|
7990 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
|
7991 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
|
7992 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
|
7993 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
|
7994 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7995 # Test "ListResources()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
7996 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
|
7997 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
|
7998 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
|
7999 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
|
8000 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8001 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
|
8002 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
|
8003 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
|
8004 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
|
8005 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8006 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
|
8007 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
|
8008 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
|
8009 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
|
8010 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8011 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
|
8012 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
|
8013 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
|
8014 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
|
8015 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8016 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
|
8017 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
|
8018 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
|
8019 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
|
8020 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8021 # Test "GetSingleResource()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8022 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
|
8023 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
|
8024 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
|
8025 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
|
8026 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8027 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
|
8028 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
|
8029 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
|
8030 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
|
8031 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8032 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
|
8033 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
|
8034 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
|
8035 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
|
8036 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8037 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
|
8038 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
|
8039 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
|
8040 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
|
8041 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8042 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
|
8043 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
|
8044 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
|
8045 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
|
8046 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8047 # Test "Find()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8048 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
|
8049 self.assertEqual('20070101', a[0]['MainDicomTags']['StudyDate']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8050 self.assertEqual('KNIX', a[0]['PatientMainDicomTags']['PatientName']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8051 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8052 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
|
8053 self.assertEqual('20070101', a[0]['MainDicomTags']['0008,0020']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8054 self.assertEqual('KNIX', a[0]['PatientMainDicomTags']['0010,0010']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8055 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8056 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
|
8057 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
|
8058 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
|
8059 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
|
8060 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
|
8061 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8062 # Test "GetChildResources()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8063 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
|
8064 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
|
8065 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
|
8066 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
|
8067 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8068 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
|
8069 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
|
8070 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
|
8071 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
|
8072 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8073 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
|
8074 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
|
8075 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
|
8076 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
|
8077 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8078 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
|
8079 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
|
8080 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
|
8081 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
|
8082 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8083 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
|
8084 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
|
8085 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
|
8086 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
|
8087 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8088 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
|
8089 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
|
8090 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
|
8091 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
|
8092 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8093 # Test "GetParentResource()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8094 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
|
8095 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
|
8096 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
|
8097 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
|
8098 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8099 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
|
8100 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
|
8101 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
|
8102 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
|
8103 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8104 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
|
8105 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
|
8106 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
|
8107 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
|
8108 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8109 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
|
8110 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
|
8111 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
|
8112 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
|
8113 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8114 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
|
8115 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
|
8116 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
|
8117 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
|
8118 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8119 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
|
8120 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
|
8121 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
|
8122 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
|
8123 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8124 # Test "GetChildInstancesTags()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8125 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % patient) [instance]['PatientName']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8126 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s/instances-tags?short' % patient) [instance]['0010,0010']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8127 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s/instances-tags' % patient) [instance]['0010,0010']['Value']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8128 self.assertEqual('PatientName', DoGet(_REMOTE, '/patients/%s/instances-tags' % patient) [instance]['0010,0010']['Name']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8129 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8130 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/instances-tags?simplify' % study) [instance]['PatientName']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8131 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/instances-tags?short' % study) [instance]['0010,0010']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8132 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/instances-tags' % study) [instance]['0010,0010']['Value']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8133 self.assertEqual('PatientName', DoGet(_REMOTE, '/studies/%s/instances-tags' % study) [instance]['0010,0010']['Name']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8134 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8135 self.assertEqual('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
|
8136 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
|
8137 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
|
8138 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
|
8139 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8140 # Test "GetSharedTags()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8141 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
|
8142 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
|
8143 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
|
8144 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
|
8145 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8146 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
|
8147 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
|
8148 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
|
8149 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
|
8150 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8151 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
|
8152 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
|
8153 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
|
8154 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
|
8155 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8156 # Test "GetModule()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8157 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
|
8158 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
|
8159 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
|
8160 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8161 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
|
8162 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
|
8163 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
|
8164 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8165 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
|
8166 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
|
8167 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
|
8168 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8169 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
|
8170 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
|
8171 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
|
8172 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8173 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
|
8174 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
|
8175 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
|
8176 DoGet(_REMOTE, '/instances/%s/module?simplify' % instance) ['SOPInstanceUID']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8177 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
|
8178 DoGet(_REMOTE, '/instances/%s/module?short' % instance) ['0008,0018']) |
| 413 | 8179 |
| 8180 # Test "ListQueryAnswers()" in "OrthancRestModalities.cpp" | |
| 8181 a = DoPost(_REMOTE, '/modalities/self/query', { 'Level' : 'Study', | |
| 8182 'Query' : { 'PatientID' : '*' }}) ['ID'] | |
| 8183 | |
| 8184 self.assertEqual(1, len(DoGet(_REMOTE, '/queries/%s/answers' % a))) | |
| 8185 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand' % a) [0]['0010,0020']['Value']) | |
| 8186 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/answers?expand' % a) [0]['0010,0020']['Name']) | |
| 8187 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) [0]['PatientID']) | |
| 8188 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand&short' % a) [0]['0010,0020']) | |
| 8189 | |
| 8190 # Test "GetQueryOneAnswer()" in "OrthancRestModalities.cpp" | |
| 8191 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content' % a) ['0010,0020']['Value']) | |
| 8192 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/answers/0/content' % a) ['0010,0020']['Name']) | |
| 8193 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content?simplify' % a) ['PatientID']) | |
| 8194 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content?short' % a) ['0010,0020']) | |
| 8195 | |
| 8196 # Test "GetQueryArguments()" in "OrthancRestModalities.cpp" | |
| 8197 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query' % a) ['0010,0020']['Value']) | |
| 8198 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/query' % a) ['0010,0020']['Name']) | |
| 8199 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query?simplify' % a) ['PatientID']) | |
| 8200 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query?short' % a) ['0010,0020']) | |
| 8201 | |
|
414
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8202 # Test "BulkContent()" in "OrthancRestResources.cpp" |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8203 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
|
8204 self.assertEqual(4, len(a)) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8205 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['PatientID']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8206 self.assertEqual('Knee (R)', a[1]['MainDicomTags']['StudyDescription']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8207 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['PatientName']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8208 self.assertEqual('AX. FSE PD', a[2]['MainDicomTags']['SeriesDescription']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8209 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
|
8210 a[3]['MainDicomTags']['SOPInstanceUID']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8211 |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8212 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
|
8213 'Short': True }) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8214 self.assertEqual(4, len(a)) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8215 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['0010,0020']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8216 self.assertEqual('Knee (R)', a[1]['MainDicomTags']['0008,1030']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8217 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['0010,0010']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8218 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
|
8219 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
|
8220 a[3]['MainDicomTags']['0008,0018']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8221 |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8222 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
|
8223 'Full': True }) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8224 self.assertEqual(4, len(a)) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8225 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['0010,0020']['Value']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8226 self.assertEqual('PatientID', a[0]['MainDicomTags']['0010,0020']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8227 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
|
8228 self.assertEqual('StudyDescription', a[1]['MainDicomTags']['0008,1030']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8229 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['0010,0010']['Value']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8230 self.assertEqual('PatientName', a[1]['PatientMainDicomTags']['0010,0010']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8231 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
|
8232 self.assertEqual('SeriesDescription', a[2]['MainDicomTags']['0008,103e']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8233 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
|
8234 a[3]['MainDicomTags']['0008,0018']['Value']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8235 self.assertEqual('SOPInstanceUID', a[3]['MainDicomTags']['0008,0018']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8236 |
| 415 | 8237 |
| 8238 def test_bulk_content(self): | |
| 8239 # New in Orthanc 1.9.4 | |
| 8240 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID'] | |
| 8241 knee2 = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') ['ID'] | |
| 8242 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID'] | |
| 8243 | |
| 8244 brainixHierarchy = [ | |
| 8245 DoGet(_REMOTE, '/instances/%s/patient' % brainix) ['ID'], | |
| 8246 DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID'], | |
| 8247 DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'], | |
| 8248 brainix, | |
| 8249 ] | |
| 8250 | |
| 8251 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : brainixHierarchy }) | |
| 8252 self.assertEqual(4, len(a)) | |
| 8253 b = map(lambda x: x['ID'], a) | |
| 8254 for i in range(4): | |
| 8255 self.assertEqual(brainixHierarchy[i], b[i]) | |
|
418
8a3d67a40083
test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
417
diff
changeset
|
8256 self.assertTrue('Metadata' in a[i]) |
| 415 | 8257 |
| 8258 for (level, index) in [ | |
| 8259 ('Patient', 0), | |
| 8260 ('Study', 1), | |
| 8261 ('Series', 2), | |
| 8262 ('Instance', 3), | |
| 8263 ]: | |
| 8264 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : brainixHierarchy, | |
| 8265 'Level' : level }) | |
| 8266 self.assertEqual(1, len(a)) | |
| 8267 self.assertEqual(level, a[0]['Type']) | |
| 8268 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
|
8269 self.assertTrue('Metadata' in a[0]) |
| 415 | 8270 |
| 8271 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
|
8272 'Level' : level, |
|
8a3d67a40083
test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
417
diff
changeset
|
8273 'Metadata' : False }) |
| 415 | 8274 self.assertEqual(1, len(a)) |
| 8275 self.assertEqual(level, a[0]['Type']) | |
| 8276 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
|
8277 self.assertFalse('Metadata' in a[0]) |
| 415 | 8278 |
| 8279 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, knee2, brainix ] }) | |
| 8280 self.assertEqual(3, len(a)) | |
| 8281 for item in a: | |
| 8282 self.assertEqual('Instance', item['Type']) | |
| 8283 b = map(lambda x: x['ID'], a) | |
| 8284 self.assertTrue(knee1 in b) | |
| 8285 self.assertTrue(knee2 in b) | |
| 8286 self.assertTrue(brainix in b) | |
| 8287 | |
| 8288 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, knee2 ], | |
| 8289 'Level' : 'Series' }) | |
| 8290 self.assertEqual(2, len(a)) | |
| 8291 for item in a: | |
| 8292 self.assertEqual('Series', item['Type']) | |
| 8293 b = map(lambda x: x['ID'], a) | |
| 8294 self.assertTrue(DoGet(_REMOTE, '/instances/%s' % knee1) ['ParentSeries'] in b) | |
| 8295 self.assertTrue(DoGet(_REMOTE, '/instances/%s' % knee2) ['ParentSeries'] in b) | |
| 8296 | |
| 8297 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
|
8298 'Level' : 'Study', |
|
8a3d67a40083
test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
417
diff
changeset
|
8299 'Metadata' : False }) |
| 415 | 8300 self.assertEqual(1, len(a)) |
| 8301 self.assertEqual(DoGet(_REMOTE, '/instances/%s/study' % knee1) ['ID'], a[0]['ID']) | |
| 8302 self.assertEqual('Study', a[0]['Type']) | |
| 8303 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
|
8304 self.assertFalse('Metadata' in a[0]) |
| 415 | 8305 |
| 8306 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
|
8307 'Level' : 'Patient', |
|
8a3d67a40083
test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
417
diff
changeset
|
8308 'Metadata' : True }) |
| 415 | 8309 self.assertEqual(1, len(a)) |
| 8310 self.assertEqual(DoGet(_REMOTE, '/instances/%s/patient' % knee1) ['ID'], a[0]['ID']) | |
| 8311 self.assertEqual('Patient', a[0]['Type']) | |
| 8312 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
|
8313 self.assertTrue('Metadata' in a[0]) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8314 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8315 self.assertEqual(2, len(a[0]['Metadata'])) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8316 self.assertTrue('MainDicomTagsSignature' in a[0]['Metadata']) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8317 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8318 self.assertEqual(1, len(a[0]['Metadata'])) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8319 self.assertTrue('LastUpdate' in a[0]['Metadata']) |
| 415 | 8320 |
| 8321 for level in [ 'Instance', 'Series', 'Study', 'Patient' ]: | |
| 8322 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, brainix ], | |
| 8323 'Level' : level }) | |
| 8324 self.assertEqual(2, len(a)) | |
| 8325 for item in a: | |
| 8326 self.assertEqual(level, item['Type']) | |
| 8327 b = map(lambda x: x['ID'], a) | |
| 8328 if level == 'Instance': | |
| 8329 self.assertTrue(knee1 in b) | |
| 8330 self.assertTrue(brainix in b) | |
| 8331 else: | |
| 8332 self.assertTrue(DoGet(_REMOTE, '/instances/%s/%s' % (knee1, level.lower())) ['ID'] in b) | |
| 8333 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
|
8334 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8335 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8336 def test_split_instances(self): |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8337 # New in 1.9.4 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8338 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID'] |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8339 knee2 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') ['ID'] |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8340 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8341 series = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8342 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8343 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8344 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8345 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8346 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8347 instances = DoGet(_REMOTE, '/instances') |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8348 self.assertEqual(2, len(instances)) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8349 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
|
8350 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
|
8351 for i in [ knee1, knee2 ]: |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8352 self.assertEqual(series, DoGet(_REMOTE, '/instances/%s/series' % i) ['ID']) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8353 self.assertEqual(study, DoGet(_REMOTE, '/instances/%s/study' % i) ['ID']) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8354 |
| 417 | 8355 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, { |
| 8356 'KeepSource' : False | |
| 8357 })) # Neither "Instances", nor "Series" | |
| 8358 | |
| 8359 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, { | |
| 8360 'KeepSource' : False, | |
| 8361 'Instances' : [ ], | |
| 8362 'Series' : [ ] | |
| 8363 })) # Empty "Instances" and "Series" | |
| 8364 | |
| 8365 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, { | |
| 8366 'Instances' : [ 'nope' ], | |
| 8367 'KeepSource' : False | |
| 8368 })) | |
| 8369 | |
| 8370 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, { | |
| 8371 'Series' : [ 'nope' ], | |
| 8372 'KeepSource' : False | |
| 8373 })) | |
| 8374 | |
|
416
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8375 result = DoPost(_REMOTE, '/studies/%s/split' % study, { |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8376 'Instances' : [ knee1 ], |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8377 'KeepSource' : False |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8378 }) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8379 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8380 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8381 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8382 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8383 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8384 instances = DoGet(_REMOTE, '/instances') |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8385 self.assertEqual(2, len(instances)) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8386 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8387 self.assertFalse(knee1 in instances) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8388 self.assertTrue(knee2 in instances) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8389 instances.remove(knee2) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8390 self.assertEqual(series, DoGet(_REMOTE, '/instances/%s/series' % knee2) ['ID']) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8391 self.assertEqual(study, DoGet(_REMOTE, '/instances/%s/study' % knee2) ['ID']) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8392 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
|
8393 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
|
8394 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
|
8395 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8396 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8397 def test_merge_instances(self): |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8398 # New in Orthanc 1.9.4 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8399 knee = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID'] |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8400 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID'] |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8401 brainixStudy = DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID'] |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8402 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8403 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8404 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8405 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8406 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8407 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8408 instances = DoGet(_REMOTE, '/instances') |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8409 self.assertEqual(2, len(instances)) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8410 self.assertTrue(brainix in instances) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8411 self.assertTrue(knee in instances) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8412 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8413 result = DoPost(_REMOTE, '/studies/%s/merge' % brainixStudy, { |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8414 'Resources' : [ knee ] |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8415 }) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8416 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8417 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8418 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8419 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8420 self.assertEqual(brainixStudy, DoGet(_REMOTE, '/studies')[0]) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8421 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8422 instances = DoGet(_REMOTE, '/instances') |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8423 self.assertEqual(2, len(instances)) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8424 self.assertTrue(brainix in instances) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8425 self.assertFalse(knee in instances) |
|
423
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8426 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8427 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8428 def test_query_retrieve_format(self): |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8429 # New in Orthanc 1.9.5 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8430 # 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
|
8431 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
|
8432 study = DoGet(_REMOTE, '/instances/%s/study' % i) ['MainDicomTags']['StudyInstanceUID'] |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8433 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8434 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8435 'Level' : 'Study', |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8436 'Query' : {} |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8437 }) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8438 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8439 b = DoGet(_REMOTE, a['Path'] + '/answers') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8440 self.assertEqual(1, len(b)) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8441 self.assertEqual('0', b[0]) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8442 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8443 b = DoGet(_REMOTE, a['Path'] + '/answers?expand') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8444 self.assertEqual(1, len(b)) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8445 self.assertEqual(6, len(b[0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8446 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
|
8447 self.assertEqual('SpecificCharacterSet', b[0]['0008,0005']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8448 self.assertEqual('A10003245599', b[0]['0008,0050']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8449 self.assertEqual('AccessionNumber', b[0]['0008,0050']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8450 self.assertEqual('STUDY', b[0]['0008,0052']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8451 self.assertEqual('QueryRetrieveLevel', b[0]['0008,0052']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8452 self.assertEqual('ORTHANC', b[0]['0008,0054']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8453 self.assertEqual('RetrieveAETitle', b[0]['0008,0054']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8454 self.assertEqual('887', b[0]['0010,0020']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8455 self.assertEqual('PatientID', b[0]['0010,0020']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8456 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
|
8457 self.assertEqual('StudyInstanceUID', b[0]['0020,000d']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8458 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8459 for (key, value) in b[0].items(): |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8460 self.assertEqual('String', value['Type']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8461 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8462 self.assertEqual(json.dumps(b[0]), |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8463 json.dumps(DoGet(_REMOTE, a['Path'] + '/answers/0/content'))) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8464 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8465 # 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
|
8466 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8467 b = DoGet(_REMOTE, a['Path'] + '/answers?expand&short') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8468 self.assertEqual(1, len(b)) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8469 self.assertEqual(6, len(b[0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8470 self.assertEqual('ISO_IR 100', b[0]['0008,0005']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8471 self.assertEqual('A10003245599', b[0]['0008,0050']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8472 self.assertEqual('STUDY', b[0]['0008,0052']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8473 self.assertEqual('ORTHANC', b[0]['0008,0054']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8474 self.assertEqual('887', b[0]['0010,0020']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8475 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
|
8476 self.assertEqual(json.dumps(b[0]), |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8477 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
|
8478 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8479 b = DoGet(_REMOTE, a['Path'] + '/answers?expand&simplify') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8480 self.assertEqual(1, len(b)) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8481 self.assertEqual(6, len(b[0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8482 self.assertEqual('ISO_IR 100', b[0]['SpecificCharacterSet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8483 self.assertEqual('A10003245599', b[0]['AccessionNumber']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8484 self.assertEqual('STUDY', b[0]['QueryRetrieveLevel']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8485 self.assertEqual('ORTHANC', b[0]['RetrieveAETitle']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8486 self.assertEqual('887', b[0]['PatientID']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8487 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
|
8488 self.assertEqual(json.dumps(b[0]), |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8489 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
|
8490 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8491 b = DoPost(_REMOTE, '/queries/%s/retrieve' % a['ID'], {}) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8492 self.assertEqual('REST API', b['Description']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8493 self.assertEqual('ORTHANC', b['LocalAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8494 self.assertEqual('ORTHANC', b['RemoteAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8495 self.assertEqual(1, len(b['Query'])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8496 self.assertEqual(4, len(b['Query'][0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8497 self.assertEqual('A10003245599', b['Query'][0]['0008,0050']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8498 self.assertEqual('STUDY', b['Query'][0]['0008,0052']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8499 self.assertEqual('887', b['Query'][0]['0010,0020']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8500 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
|
8501 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8502 # 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
|
8503 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8504 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
|
8505 self.assertEqual('REST API', b['Description']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8506 self.assertEqual('ORTHANC', b['LocalAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8507 self.assertEqual('ORTHANC', b['RemoteAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8508 self.assertEqual(1, len(b['Query'])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8509 self.assertEqual(4, len(b['Query'][0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8510 self.assertEqual('A10003245599', b['Query'][0]['0008,0050']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8511 self.assertEqual('STUDY', b['Query'][0]['0008,0052']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8512 self.assertEqual('887', b['Query'][0]['0010,0020']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8513 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
|
8514 self.assertEqual('AccessionNumber', b['Query'][0]['0008,0050']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8515 self.assertEqual('QueryRetrieveLevel', b['Query'][0]['0008,0052']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8516 self.assertEqual('PatientID', b['Query'][0]['0010,0020']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8517 self.assertEqual('StudyInstanceUID', b['Query'][0]['0020,000d']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8518 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8519 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
|
8520 self.assertEqual('REST API', b['Description']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8521 self.assertEqual('ORTHANC', b['LocalAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8522 self.assertEqual('ORTHANC', b['RemoteAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8523 self.assertEqual(1, len(b['Query'])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8524 self.assertEqual(4, len(b['Query'][0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8525 self.assertEqual('A10003245599', b['Query'][0]['AccessionNumber']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8526 self.assertEqual('STUDY', b['Query'][0]['QueryRetrieveLevel']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8527 self.assertEqual('887', b['Query'][0]['PatientID']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8528 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
|
8529 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8530 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8531 def test_anonymize_nested(self): |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8532 # New in Orthanc 1.9.5 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8533 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8534 tags = { |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8535 'MappingResourceIdentificationSequence' : [ |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8536 { |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8537 # Test "DicomModification::RelationshipsVisitor::GetDefaultAction()" |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8538 '0009,1002' : 'ABCD', # Private tag not registered in dictionary |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8539 '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
|
8540 '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
|
8541 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8542 # Test "DicomModification::RelationshipsVisitor::VisitString()" |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8543 'StudyDescription' : 'Hello', # Removed |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8544 'StudyDate' : '20210705', # Cleared |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8545 '0009,1001' : '-1234', # Private tag whose VR is DS |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8546 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8547 # Test anonymization of nested sequences |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8548 'ReferencedStudySequence' : [ |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8549 { |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8550 'PatientID' : 'HELLO' |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8551 } |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8552 ], |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8553 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8554 # Non-anonymized tags |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8555 'CodeMeaning' : 'MEANING1', |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8556 'EquivalentCodeSequence' : [ |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8557 { |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8558 'CodeMeaning' : 'MEANING2', |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8559 } |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8560 ], |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8561 } |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8562 ], |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8563 } |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8564 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8565 a = DoPost(_REMOTE, '/tools/create-dicom', |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8566 json.dumps({ |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8567 'Tags' : tags, |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8568 'PrivateCreator' : 'Lunit', |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8569 })) ['ID'] |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8570 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8571 study = DoGet(_REMOTE, '/instances/%s/study' % a) ['ID'] |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8572 b = DoPost(_REMOTE, '/studies/%s/anonymize' % study, {}) ['ID'] |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8573 c = DoGet(_REMOTE, '/studies/%s/instances' % b) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8574 self.assertEqual(1, len(c)) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8575 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8576 tags1 = DoGet(_REMOTE, '/instances/%s/tags?short' % a) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8577 tags2 = DoGet(_REMOTE, '/instances/%s/tags?short' % c[0]['ID']) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8578 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8579 # Only "StudyDate" must be present in |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8580 # "MappingResourceIdentificationSequence" after anonymization |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8581 self.assertEqual(1, len(tags1['0008,0124'])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8582 self.assertEqual(1, len(tags2['0008,0124'])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8583 self.assertEqual(9, len(tags1['0008,0124'][0])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8584 self.assertEqual(3, len(tags2['0008,0124'][0])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8585 self.assertEqual('', tags2['0008,0124'][0]['0008,0020']) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8586 self.assertEqual('MEANING1', tags2['0008,0124'][0]['0008,0104']) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8587 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
|
8588 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8589 self.assertTrue('0008,1110' in tags1['0008,0124'][0]) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8590 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
|
8591 |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
8592 |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
8593 def test_issue_200(self): |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
8594 # 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
|
8595 # https://bugs.orthanc-server.com/show_bug.cgi?id=200 |
| 428 | 8596 self.assertEqual(0, len(DoGet(_REMOTE, '/changes') ['Changes'])) |
| 8597 self.assertEqual(0, len(DoGet(_REMOTE, '/changes?last') ['Changes'])) | |
| 429 | 8598 u = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
427
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
8599 |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
8600 for change in DoGet(_REMOTE, '/changes') ['Changes']: |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
8601 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
|
8602 self.assertTrue(re.match('[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}', change['ID'])) |
| 428 | 8603 |
| 8604 last = DoGet(_REMOTE, '/changes?last') ['Changes'] | |
| 8605 self.assertEqual(1, len(last)) | |
| 8606 self.assertTrue(re.match('[0-9]{8}T[0-9]{6}', last[0]['Date'])) | |
| 8607 self.assertTrue(re.match('[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}', last[0]['ID'])) | |
| 429 | 8608 |
| 8609 self.assertEqual(0, len(DoGet(_REMOTE, '/exports') ['Exports'])) | |
| 8610 self.assertEqual(0, len(DoGet(_REMOTE, '/exports?last') ['Exports'])) | |
| 8611 DoPost(_REMOTE, '/modalities/self/store', [ u ]) | |
| 8612 | |
| 8613 for change in DoGet(_REMOTE, '/exports') ['Exports']: | |
| 8614 self.assertTrue(re.match('[0-9]{8}T[0-9]{6}', change['Date'])) | |
| 8615 self.assertTrue(re.match('[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}', change['ID'])) | |
| 8616 | |
| 8617 last = DoGet(_REMOTE, '/exports?last') ['Exports'] | |
| 8618 self.assertEqual(1, len(last)) | |
| 8619 self.assertEqual('ozp00SjY2xG', last[0]['PatientID']) | |
| 8620 self.assertEqual('self', last[0]['RemoteModality']) | |
| 8621 self.assertEqual('Instance', last[0]['ResourceType']) | |
| 8622 self.assertEqual('/instances/%s' % last[0]['ID'], last[0]['Path']) | |
| 8623 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', last[0]['StudyInstanceUID']) | |
| 8624 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', last[0]['SeriesInstanceUID']) | |
| 8625 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', last[0]['SOPInstanceUID']) | |
| 8626 self.assertTrue(re.match('[0-9]{8}T[0-9]{6}', last[0]['Date'])) | |
| 8627 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
|
8628 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8629 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8630 def test_upload_dicomdir_archive(self): |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8631 # This test fails on Orthanc <= 1.9.6 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8632 # 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
|
8633 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8634 # Create a ZIP archive with a DICOMDIR |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8635 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8636 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8637 media = DoGet(_REMOTE, '/studies/%s/media' % study) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8638 DoDelete(_REMOTE, '/instances/%s' % instance) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8639 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8640 result = DoPost(_REMOTE, '/instances', media) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8641 self.assertEqual(1, len(result)) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8642 self.assertEqual(instance, result[0]['ID']) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
8643 self.assertEqual('Success', result[0]['Status']) |
|
432
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8644 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8645 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8646 def test_modify_keep_source(self): |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8647 # 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
|
8648 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8649 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8650 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8651 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8652 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, {}) ['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8653 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8654 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8655 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8656 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8657 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
|
8658 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8659 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8660 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8661 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8662 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
|
8663 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8664 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8665 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8666 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8667 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8668 a = DoPost(_REMOTE, '/studies/%s/modify' % study, { 'Replace' : { } }) ['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8669 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8670 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8671 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8672 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8673 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
|
8674 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8675 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8676 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8677 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8678 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
|
8679 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8680 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8681 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8682 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8683 def GetStudy(a): |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8684 b = filter(lambda x: x['Type'] == 'Study', a['Resources']) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8685 if len(b) == 1: |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8686 return b[0]['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8687 else: |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8688 raise Exception() |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8689 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8690 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8691 a = GetStudy(DoPost(_REMOTE, '/tools/bulk-anonymize', { 'Resources' : [ study ]})) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8692 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8693 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8694 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8695 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8696 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
|
8697 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8698 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8699 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8700 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8701 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
|
8702 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8703 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8704 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8705 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8706 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8707 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
|
8708 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8709 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8710 # 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
|
8711 # 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
|
8712 # the original instance |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8713 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8714 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8715 # 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
|
8716 # introduced in 1.9.7 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8717 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8718 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8719 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
|
8720 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8721 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8722 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8723 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8724 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
|
8725 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8726 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8727 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8728 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8729 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
|
8730 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8731 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
8732 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
433
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8733 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8734 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8735 def test_multiframe_windowing(self): |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8736 # Fixed in Orthanc 1.9.7 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8737 a = UploadInstance(_REMOTE, 'MultiframeWindowing.dcm') ['ID'] |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8738 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8739 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
|
8740 self.assertEqual(0x00, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8741 self.assertEqual(0x10, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8742 self.assertEqual(0x20, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8743 self.assertEqual(0x30, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8744 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8745 # 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
|
8746 # mid-level value (i.e. 127) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8747 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
|
8748 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8749 self.assertEqual(127, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8750 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8751 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8752 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8753 # 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
|
8754 im = GetImage(_REMOTE, '/instances/%s/frames/0/rendered' % a) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8755 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8756 self.assertEqual(127, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8757 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8758 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8759 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8760 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
|
8761 self.assertEqual(100, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8762 self.assertEqual(116, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8763 self.assertEqual(132, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8764 self.assertEqual(148, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8765 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8766 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
|
8767 self.assertEqual(0, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8768 self.assertEqual(32, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8769 self.assertEqual(64, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8770 self.assertEqual(96, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8771 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8772 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
|
8773 self.assertEqual(100, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8774 self.assertEqual(132, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8775 self.assertEqual(164, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8776 self.assertEqual(196, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8777 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8778 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
|
8779 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8780 self.assertEqual(127, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8781 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8782 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
8783 |
|
436
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8784 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8785 def test_dicom_seg(self): |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8786 # This test fails in Orthanc <= 1.9.7 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8787 a = UploadInstance(_REMOTE, 'DicomSeg.dcm') ['ID'] |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8788 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8789 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
|
8790 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
|
8791 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8792 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
|
8793 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
|
8794 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8795 for i in range(96): |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8796 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
|
8797 self.assertEqual('L', im.mode) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8798 self.assertEqual(256, im.size[0]) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8799 self.assertEqual(256, im.size[1]) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8800 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8801 e = im.getextrema() |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8802 self.assertEqual(0, e[0]) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8803 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8804 if e[1] == 0: |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8805 self.assertFalse(i in nonEmptyFrames) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8806 else: |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8807 self.assertTrue(i in nonEmptyFrames) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8808 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8809 im1 = GetImage(_REMOTE, '/instances/%s/frames/44/preview' % a) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8810 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8811 # 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
|
8812 im2 = Image.open(GetDatabasePath('DicomSeg-Frame45.pgm')) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8813 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
|
8814 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
8815 self.assertTrue(ImageChops.difference(im1, im2).getbbox() is None) |
| 440 | 8816 |
| 8817 | |
| 8818 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
|
8819 # New in Orthanc 1.10.0 |
| 440 | 8820 a = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] |
| 8821 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm') | |
| 8822 b = UploadInstance(_REMOTE, 'DicomSeg.dcm') ['ID'] | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8823 d = UploadInstance(_REMOTE, 'Issue124.dcm') ['ID'] |
| 440 | 8824 |
| 8825 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/0/numpy' % a))) | |
| 8826 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8827 self.assertEqual(numpy.float32, c.dtype) | |
| 8828 self.assertEqual((288, 288, 1), c.shape) | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8829 self.assertAlmostEqual(0, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8830 self.assertAlmostEqual(536, c.max()) |
| 440 | 8831 |
| 8832 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/0/numpy?rescale=0' % a))) | |
| 8833 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8834 self.assertEqual(numpy.uint16, c.dtype) | |
| 8835 self.assertEqual((288, 288, 1), c.shape) | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8836 self.assertEqual(0, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8837 self.assertEqual(536, c.max()) |
| 440 | 8838 |
| 8839 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/numpy?rescale=1&compress=false' % a))) | |
| 8840 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8841 self.assertEqual(numpy.float32, c.dtype) | |
| 8842 self.assertEqual((1, 288, 288, 1), c.shape) | |
| 8843 | |
| 8844 series = DoGet(_REMOTE, '/instances/%s/series' % a)['ID'] | |
| 8845 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/series/%s/numpy?rescale=true&compress=0' % series))) | |
| 8846 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8847 self.assertEqual(numpy.float32, c.dtype) | |
| 8848 self.assertEqual((2, 288, 288, 1), c.shape) | |
| 8849 | |
| 8850 series = DoGet(_REMOTE, '/instances/%s/series' % a)['ID'] | |
| 8851 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/series/%s/numpy?rescale=1' % series))) | |
| 8852 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8853 self.assertEqual(numpy.float32, c.dtype) | |
| 8854 self.assertEqual((2, 288, 288, 1), c.shape) | |
| 8855 | |
| 8856 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/numpy?compress' % a))) | |
| 8857 self.assertTrue(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8858 self.assertEqual(1, len(c.files)) | |
| 8859 self.assertEqual(numpy.float32, c['arr_0'].dtype) | |
| 8860 self.assertEqual((1, 288, 288, 1), c['arr_0'].shape) | |
| 8861 | |
| 8862 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/0/numpy' % b))) | |
| 8863 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8864 self.assertEqual(numpy.float32, c.dtype) | |
| 8865 self.assertEqual((256, 256, 1), c.shape) | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8866 self.assertAlmostEqual(0, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8867 self.assertAlmostEqual(0, c.max()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8868 |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8869 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
|
8870 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8871 self.assertEqual(numpy.float32, c.dtype) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8872 self.assertEqual((256, 256, 1), c.shape) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8873 self.assertAlmostEqual(0, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8874 self.assertAlmostEqual(255, c.max()) |
| 440 | 8875 |
| 8876 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/numpy' % b))) | |
| 8877 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8878 self.assertEqual(numpy.float32, c.dtype) | |
| 8879 self.assertEqual((96, 256, 256, 1), c.shape) | |
| 8880 | |
| 8881 series = DoGet(_REMOTE, '/instances/%s/series' % b)['ID'] | |
| 8882 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/series/%s/numpy' % series))) | |
| 8883 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 8884 self.assertEqual(numpy.float32, c.dtype) | |
| 8885 self.assertEqual((96, 256, 256, 1), c.shape) | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8886 |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8887 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
|
8888 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8889 self.assertEqual(numpy.float32, c.dtype) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8890 self.assertEqual((512, 512, 1), c.shape) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8891 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
|
8892 self.assertAlmostEqual(2374, c.max()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8893 |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8894 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
|
8895 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8896 self.assertEqual(numpy.int16, c.dtype) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8897 self.assertEqual((512, 512, 1), c.shape) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8898 self.assertEqual(-2000, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
8899 self.assertEqual(3398, c.max()) |
|
442
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8900 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8901 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8902 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
|
8903 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
|
8904 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8905 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
|
8906 "Replace" : { |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8907 "PatientName" : "MyName[*]", |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8908 "PatientID": "test_brackets" |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8909 }, |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8910 "Force": True |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8911 }), |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8912 'application/json') |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8913 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8914 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
|
8915 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8916 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
|
8917 'Query' : { 'PatientName' : 'MyName[*]' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8918 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8919 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8920 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
|
8921 'Query' : { 'PatientName' : 'MyName[*]' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8922 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8923 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8924 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
|
8925 'Query' : { 'PatientName' : 'MyName*' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8926 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8927 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8928 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
|
8929 'Query' : { 'PatientName' : 'MyName*' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8930 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8931 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8932 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
|
8933 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
|
8934 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8935 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
|
8936 "Replace" : { |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8937 "PatientName" : "MyName2[]", |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8938 "PatientID": "test_brackets2" |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8939 }, |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8940 "Force": True |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8941 }), |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8942 'application/json') |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8943 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8944 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
|
8945 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8946 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
|
8947 'Query' : { 'PatientName' : 'MyName2[*]' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8948 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8949 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8950 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
|
8951 'Query' : { 'PatientName' : 'MyName2[*]' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8952 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8953 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8954 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
|
8955 'Query' : { 'PatientName' : 'MyName2*' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8956 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8957 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8958 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
|
8959 'Query' : { 'PatientName' : 'MyName2*' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
8960 self.assertEqual(1, len(a)) |
|
455
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
8961 |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
8962 |
|
452
45dd181b0f17
added test for requestedTags in tools/find + list-resources
Alain Mazy <am@osimis.io>
parents:
451
diff
changeset
|
8963 def test_rest_find_requested_tags(self): |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
8964 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): # RequestedTags introduced in 1.11.0 but Sequences allowed since 1.11.1 |
| 471 | 8965 |
| 8966 # Upload instances | |
| 8967 for i in range(2): | |
| 8968 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 8969 | |
| 8970 # Patient level | |
| 8971 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 8972 'CaseSensitive' : False, | |
| 8973 'Query' : { 'PatientName' : 'BRAINIX' }, | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
8974 'RequestedTags' : [ 'PatientName', 'PatientID', 'PatientSex', 'PatientBirthDate'], |
| 471 | 8975 'Expand': True |
| 8976 }) | |
| 8977 self.assertEqual(1, len(a)) | |
| 8978 self.assertIn('PatientName', a[0]['RequestedTags']) | |
| 8979 self.assertIn('PatientID', a[0]['RequestedTags']) | |
| 8980 self.assertIn('PatientSex', a[0]['RequestedTags']) | |
| 8981 self.assertIn('PatientBirthDate', a[0]['RequestedTags']) | |
| 8982 | |
| 8983 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 8984 self.assertEqual('5Yp0E', a[0]['RequestedTags']['PatientID']) | |
| 8985 self.assertEqual('0000', a[0]['RequestedTags']['PatientSex']) | |
| 8986 self.assertEqual('19490301', a[0]['RequestedTags']['PatientBirthDate']) | |
| 8987 | |
| 8988 # Study level, request patient tags too | |
| 8989 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 8990 'CaseSensitive' : False, | |
| 8991 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 8992 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID'], | |
| 8993 'Expand': True | |
| 8994 }) | |
| 8995 self.assertEqual(1, len(a)) | |
| 8996 self.assertIn('PatientName', a[0]['RequestedTags']) | |
| 8997 self.assertIn('StudyInstanceUID', a[0]['RequestedTags']) | |
| 8998 | |
| 8999 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9000 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9001 | |
| 9002 | |
| 9003 # Series level, request patient and study tags too | |
| 9004 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 9005 'CaseSensitive' : False, | |
| 9006 'Query' : { 'PatientName' : 'BRAINIX' }, | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
9007 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'RequestAttributesSequence'], |
| 471 | 9008 'Expand': True |
| 9009 }) | |
| 9010 self.assertEqual(1, len(a)) | |
| 9011 self.assertIn('PatientName', a[0]['RequestedTags']) | |
| 9012 self.assertIn('StudyInstanceUID', a[0]['RequestedTags']) | |
| 9013 self.assertIn('SeriesInstanceUID', a[0]['RequestedTags']) | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
9014 self.assertIn('RequestAttributesSequence', a[0]['RequestedTags']) |
| 471 | 9015 |
| 9016 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9017 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9018 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
|
9019 self.assertEqual('A10029316690', a[0]['RequestedTags']['RequestAttributesSequence'][0]['RequestedProcedureID']) |
| 471 | 9020 |
| 9021 | |
| 9022 # Instance level, request patient, study and series tags too, include tags that are not part of the main dicom tags | |
| 9023 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 9024 'CaseSensitive' : False, | |
| 9025 'Query' : { 'PatientName' : 'BRAINIX' }, | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
9026 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'PhotometricInterpretation', 'RequestAttributesSequence'], |
| 471 | 9027 'Expand': True |
| 9028 }) | |
| 9029 self.assertEqual(1, len(a)) | |
| 9030 self.assertIn('PatientName', a[0]['RequestedTags']) | |
| 9031 self.assertIn('StudyInstanceUID', a[0]['RequestedTags']) | |
| 9032 self.assertIn('SeriesInstanceUID', a[0]['RequestedTags']) | |
| 9033 self.assertIn('PhotometricInterpretation', a[0]['RequestedTags']) | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
9034 self.assertIn('RequestAttributesSequence', a[0]['RequestedTags']) |
| 471 | 9035 |
| 9036 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9037 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9038 self.assertEqual('1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', a[0]['RequestedTags']['SeriesInstanceUID']) | |
| 9039 self.assertEqual('MONOCHROME2', a[0]['RequestedTags']['PhotometricInterpretation']) | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
9040 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
|
9041 |
|
45dd181b0f17
added test for requestedTags in tools/find + list-resources
Alain Mazy <am@osimis.io>
parents:
451
diff
changeset
|
9042 |
|
453
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
9043 def test_rest_find_requested_tags_computed_tags(self): |
| 471 | 9044 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 9045 # Upload instances | |
| 9046 for i in range(2): | |
| 9047 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 9048 | |
| 9049 | |
| 9050 # Patient level | |
| 9051 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 9052 'CaseSensitive' : False, | |
| 9053 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 9054 'RequestedTags' : [ 'PatientName', 'NumberOfPatientRelatedStudies', 'NumberOfPatientRelatedSeries', 'NumberOfPatientRelatedInstances'], | |
| 9055 'Expand': True | |
| 9056 }) | |
| 9057 self.assertEqual(1, len(a)) | |
| 9058 | |
| 9059 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9060 self.assertEqual('1', a[0]['RequestedTags']['NumberOfPatientRelatedStudies']) | |
| 9061 self.assertEqual('1', a[0]['RequestedTags']['NumberOfPatientRelatedSeries']) | |
| 9062 self.assertEqual('2', a[0]['RequestedTags']['NumberOfPatientRelatedInstances']) | |
| 9063 | |
| 9064 # Study level | |
| 9065 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 9066 'CaseSensitive' : False, | |
| 9067 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 9068 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'ModalitiesInStudy', 'SOPClassesInStudy', 'NumberOfStudyRelatedInstances', 'NumberOfStudyRelatedSeries'], | |
| 9069 'Expand': True | |
| 9070 }) | |
| 9071 self.assertEqual(1, len(a)) | |
| 9072 | |
| 9073 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9074 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9075 self.assertEqual('MR', a[0]['RequestedTags']['ModalitiesInStudy']) | |
| 9076 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', a[0]['RequestedTags']['SOPClassesInStudy']) | |
| 9077 self.assertEqual('2', a[0]['RequestedTags']['NumberOfStudyRelatedInstances']) | |
| 9078 self.assertEqual('1', a[0]['RequestedTags']['NumberOfStudyRelatedSeries']) | |
| 9079 | |
| 9080 # Series level | |
| 9081 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 9082 'CaseSensitive' : False, | |
| 9083 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 9084 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'NumberOfSeriesRelatedInstances'], | |
| 9085 'Expand': True | |
| 9086 }) | |
| 9087 self.assertEqual(1, len(a)) | |
| 9088 | |
| 9089 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9090 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9091 self.assertEqual('2', a[0]['RequestedTags']['NumberOfSeriesRelatedInstances']) | |
| 9092 | |
| 9093 # Instance level | |
| 9094 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', | |
| 9095 'CaseSensitive' : False, | |
| 9096 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 9097 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SOPInstanceUID', 'InstanceAvailability'], | |
| 9098 'Expand': True | |
| 9099 }) | |
| 9100 self.assertEqual(2, len(a)) | |
| 9101 | |
| 9102 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9103 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9104 self.assertEqual('ONLINE', a[0]['RequestedTags']['InstanceAvailability']) | |
| 456 | 9105 |
|
452
45dd181b0f17
added test for requestedTags in tools/find + list-resources
Alain Mazy <am@osimis.io>
parents:
451
diff
changeset
|
9106 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
|
9107 |
| 471 | 9108 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 9109 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] | |
| 9110 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] | |
| 9111 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] | |
| 9112 | |
| 9113 # list series and request tags that are not in the default main dicom tags | |
| 9114 a = DoGet(_REMOTE, '/studies/%s/series?expand&simplify&requestedTags=PatientName;Modality;SeriesInstanceUID;MRAcquisitionType' % study) | |
| 9115 | |
| 9116 self.assertEqual('2D', a[0]['RequestedTags']['MRAcquisitionType']) | |
| 9117 self.assertEqual('MR', a[0]['RequestedTags']['Modality']) | |
| 9118 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 9119 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID']) | |
| 9120 | |
| 9121 # list studies and request patient and studies tags | |
| 9122 a = DoGet(_REMOTE, '/patients/%s/studies?expand&simplify&requestedTags=PatientName;StudyInstanceUID' % patient) | |
| 9123 | |
| 9124 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9125 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 9126 | |
| 9127 | |
| 9128 # list instances and request patient, studies and series tags including tags that are not in main dicom tags | |
| 9129 a = DoGet(_REMOTE, '/patients/%s/instances?expand&simplify&requestedTags=PatientName;StudyInstanceUID;SeriesInstanceUID;SOPInstanceUID;Rows;Columns;InstanceAvailability' % patient) | |
| 9130 | |
| 9131 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9132 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID']) | |
| 9133 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a[0]['RequestedTags']['SOPInstanceUID']) | |
| 9134 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 9135 self.assertEqual('512', a[0]['RequestedTags']['Rows']) | |
| 9136 self.assertEqual('512', a[0]['RequestedTags']['Columns']) | |
| 9137 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
|
9138 |
|
453
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
9139 |
|
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
9140 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
|
9141 |
| 471 | 9142 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 9143 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] | |
| 9144 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] | |
| 9145 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] | |
| 9146 | |
| 9147 # list studies and request patient and studies tags, including ModalitiesInStudy | |
| 9148 a = DoGet(_REMOTE, '/patients/%s/studies?expand&simplify&requestedTags=PatientName;StudyInstanceUID;ModalitiesInStudy;SOPClassesInStudy;NumberOfStudyRelatedInstances;NumberOfStudyRelatedSeries' % patient) | |
| 9149 | |
| 9150 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9151 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 9152 self.assertEqual('MR', a[0]['RequestedTags']['ModalitiesInStudy']) | |
| 9153 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', a[0]['RequestedTags']['SOPClassesInStudy']) | |
| 9154 self.assertEqual('1', a[0]['RequestedTags']['NumberOfStudyRelatedInstances']) | |
| 9155 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
|
9156 |
|
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
9157 |
|
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
9158 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
|
9159 |
| 471 | 9160 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 9161 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] | |
| 9162 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] | |
| 9163 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] | |
| 9164 | |
| 9165 # list studies and request patient and studies tags, including ModalitiesInStudy | |
| 9166 a = DoGet(_REMOTE, '/studies/%s/series?expand&simplify&requestedTags=PatientName;SeriesInstanceUID;NumberOfSeriesRelatedInstances' % study) | |
| 9167 | |
| 9168 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID']) | |
| 9169 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 9170 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
|
9171 |
|
455
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
9172 def test_dicomweb_jpeg2k_implicit(self): |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
9173 # This is a file encoded using 1.2.840.10008.1.2.4.90 transfer |
| 457 | 9174 # 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
|
9175 # representation. Support introduced in Orthanc 1.10.1. |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
9176 # 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
|
9177 a = UploadInstance(_REMOTE, '2022-03-08-RicSmi.dcm') ['ID'] |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
9178 b = DoGet(_REMOTE, '/instances/%s/file' % a, |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
9179 headers = { 'Accept' : 'application/dicom+json' }) |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
9180 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
|
9181 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
|
9182 |
|
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
|
9183 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
|
9184 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
|
9185 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
|
9186 |
|
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
|
9187 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
|
9188 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
|
9189 '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
|
9190 '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
|
9191 '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
|
9192 '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
|
9193 })) |
|
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
|
9194 |
|
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
|
9195 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
|
9196 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
|
9197 |
|
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
|
9198 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
|
9199 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
|
9200 |
|
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
|
9201 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
|
9202 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
|
9203 |
|
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
|
9204 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
|
9205 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
|
9206 self.assertEqual(j['ID'], i['ID']) |
|
501
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
9207 |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
9208 def test_storescu_custom_host_ip_port(self): |
| 510 | 9209 if IsOrthancVersionAbove(_REMOTE, 1, 11, 3): |
| 9210 DropOrthanc(_LOCAL) | |
| 9211 DropOrthanc(_REMOTE) | |
| 9212 | |
| 9213 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 9214 | |
| 9215 # upload to self -> orthanctest shall not receive any content | |
| 9216 DoPost(_REMOTE, '/modalities/self/store', { | |
| 9217 'Resources' : [ a['ID']] | |
| 9218 }) | |
| 9219 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 9220 | |
| 9221 # upload to self by overriding it with config from orthanctest -> orthanctest shall receive the content | |
| 9222 c = DoGet(_REMOTE, '/modalities/orthanctest/configuration') | |
| 9223 DoPost(_REMOTE, '/modalities/self/store', { | |
| 9224 'LocalAet' : 'YOP', | |
| 9225 'CalledAet' : c['AET'], | |
| 9226 'Port' : c['Port'], | |
| 9227 'Host' : c['Host'], | |
| 9228 'Resources' : [ a['ID']] | |
| 9229 }) | |
| 9230 | |
| 9231 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 9232 | |
| 9233 DropOrthanc(_REMOTE) | |
| 9234 DropOrthanc(_LOCAL) | |
|
503
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
9235 |
|
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
9236 def test_rle_planar_configuration(self): |
|
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
9237 # This test failed in Orthanc <= 1.11.2 |
|
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
9238 # https://groups.google.com/g/orthanc-users/c/CSVWfRasSR0/m/y1XDRXVnAgAJ |
|
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
9239 a = UploadInstance(_REMOTE, '2022-11-14-RLEPlanarConfiguration.dcm') ['ID'] |
|
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
9240 uri = '/instances/%s/preview' % a |
|
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
9241 im = GetImage(_REMOTE, uri) |
|
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
9242 self.assertEqual('RGB', im.mode) |
|
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
9243 self.assertEqual(1475, im.size[0]) |
|
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
9244 self.assertEqual(1475, im.size[1]) |
|
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
9245 self.assertEqual('c684b0050dc2523041240bf2d26dc85e', ComputeMD5(DoGet(_REMOTE, uri))) |
| 512 | 9246 |
| 9247 def test_rest_api_write_to_file_system(self): | |
| 9248 if IsOrthancVersionAbove(_REMOTE, 1, 12, 0): | |
| 9249 a = UploadInstance(_REMOTE, '2022-11-14-RLEPlanarConfiguration.dcm') ['ID'] | |
| 9250 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances/%s/export' % a, '/tmp/test.dcm')) | |
| 513 | 9251 |
| 9252 def test_labels(self): | |
| 9253 if IsOrthancVersionAbove(_REMOTE, 1, 12, 0): | |
| 9254 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 9255 patient = DoGet(_REMOTE, '/instances/%s/patient' % u) ['ID'] | |
| 9256 study = DoGet(_REMOTE, '/instances/%s/study' % u) ['ID'] | |
| 9257 series = DoGet(_REMOTE, '/instances/%s/series' % u) ['ID'] | |
| 9258 | |
| 9259 for base in [ '/instances/%s' % u, | |
| 9260 '/series/%s' % series, | |
| 9261 '/studies/%s' % study, | |
| 9262 '/series/%s' % series ]: | |
| 9263 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels'])) | |
| 9264 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '%s/labels/hello' % base)) | |
| 9265 self.assertEqual('', DoDelete(_REMOTE, '%s/labels/hello' % base)) | |
| 9266 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels'])) | |
| 9267 self.assertEqual('', DoPut(_REMOTE, '%s/labels/hello' % base)) | |
| 9268 self.assertEqual('', DoGet(_REMOTE, '%s/labels/hello' % base)) | |
| 9269 self.assertEqual('', DoDelete(_REMOTE, '%s/labels/hello' % base)) | |
| 9270 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels'])) | |
| 9271 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '%s/labels/hello' % base)) |