Mercurial > hg > orthanc-tests
annotate Tests/Tests.py @ 735:be8f174d3c9d find-refactoring tip
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Thu, 24 Oct 2024 15:08:59 +0200 |
| parents | 0ba04367983e |
| children |
| 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 |
|
649
5d7b6e43ab7d
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
647
diff
changeset
|
8 # Copyright (C) 2017-2023 Osimis S.A., Belgium |
|
5d7b6e43ab7d
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
647
diff
changeset
|
9 # Copyright (C) 2024-2024 Orthanc Team SRL, Belgium |
|
640
9f8276ac1cdd
update year to 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
626
diff
changeset
|
10 # Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
| 3 | 11 # |
| 12 # This program is free software: you can redistribute it and/or | |
| 13 # modify it under the terms of the GNU General Public License as | |
| 14 # published by the Free Software Foundation, either version 3 of the | |
| 15 # License, or (at your option) any later version. | |
| 16 # | |
| 17 # This program is distributed in the hope that it will be useful, but | |
| 18 # WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 19 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 20 # General Public License for more details. | |
| 21 # | |
| 22 # You should have received a copy of the GNU General Public License | |
| 23 # along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 24 | |
| 25 | |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
26 import base64 |
|
290
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
27 import bz2 |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
28 import copy |
| 440 | 29 import io |
|
439
2ca9e31d582f
numpy and getscu are now included in jodogne/orthanc-tests Docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
437
diff
changeset
|
30 import numpy |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
31 import pprint |
|
439
2ca9e31d582f
numpy and getscu are now included in jodogne/orthanc-tests Docker image
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
437
diff
changeset
|
32 import shutil |
| 14 | 33 import tempfile |
| 3 | 34 import unittest |
|
515
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
35 import time |
| 529 | 36 import os |
| 3 | 37 |
| 11 | 38 from PIL import ImageChops |
| 3 | 39 from Toolbox import * |
| 13 | 40 from xml.dom import minidom |
| 312 | 41 from datetime import datetime |
| 3 | 42 |
| 43 _LOCAL = None | |
| 44 _REMOTE = None | |
|
306
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
45 _DOCKER = False |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
46 |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
47 |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
48 def SetOrthancParameters(local, remote, withinDocker): |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
49 global _LOCAL, _REMOTE, _DOCKER |
| 3 | 50 _LOCAL = local |
| 51 _REMOTE = remote | |
|
306
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
52 _DOCKER = withinDocker |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
53 |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
54 |
| 14 | 55 def ExtractDicomTags(rawDicom, tags): |
| 56 with tempfile.NamedTemporaryFile(delete = True) as f: | |
| 57 f.write(rawDicom) | |
| 58 f.flush() | |
| 45 | 59 data = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ]) |
| 14 | 60 |
| 61 result = [] | |
| 62 for tag in tags: | |
| 63 match = re.search('<element[^>]+name="%s">([^>]*)</element>' % tag, data) | |
| 64 if match == None: | |
| 65 result.append('') | |
| 66 else: | |
| 67 result.append(match.group(1)) | |
| 68 | |
| 69 return result | |
| 70 | |
| 71 | |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
72 def CompareLists(a, b): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
73 if len(a) != len(b): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
74 return False |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
75 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
76 for i in range(len(a)): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
77 d = a[i] - b[i] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
78 if abs(d) >= 0.51: # Add some tolerance for rounding errors |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
79 return False |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
80 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
81 return True |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
82 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
83 |
|
80
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
84 def CompareTags(a, b, tagsToIgnore): |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
85 for i in tagsToIgnore: |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
86 if i in a: |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
87 del a[i] |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
88 if i in b: |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
89 del b[i] |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
90 |
| 123 | 91 if a.keys() == b.keys(): |
| 92 return True | |
| 93 else: | |
| 94 print('Mismatch in tags: %s' % str(set(a.keys()) ^ set(b.keys()))) | |
| 95 return False | |
|
80
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
96 |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
97 |
|
71
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
98 def CallFindScu(args): |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
99 p = subprocess.Popen([ FindExecutable('findscu'), |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
100 '-P', '-aec', _REMOTE['DicomAet'], '-aet', _LOCAL['DicomAet'], |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
101 _REMOTE['Server'], str(_REMOTE['DicomPort']) ] + args, |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
102 stderr=subprocess.PIPE) |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
103 return p.communicate()[1] |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
104 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
105 |
| 142 | 106 def GetMoveScuCommand(): |
| 107 return [ | |
| 108 FindExecutable('movescu'), | |
| 109 '--move', _LOCAL['DicomAet'], # Target AET (i.e. storescp) | |
| 110 '--call', _REMOTE['DicomAet'], # Called AET (i.e. Orthanc) | |
| 111 '--aetitle', _LOCAL['DicomAet'], # Calling AET (i.e. storescp) | |
| 112 _REMOTE['Server'], | |
| 113 str(_REMOTE['DicomPort']) | |
| 114 ] | |
| 115 | |
|
231
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
116 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
117 def IsDicomUntilPixelDataStored(orthanc): |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
118 # This function detects whether the "StorageCompression" option is |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
119 # "true", OR the storage area does not support read-range |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
120 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
121 if IsOrthancVersionAbove(orthanc, 1, 9, 1): |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
122 i = UploadInstance(orthanc, 'ColorTestMalaterre.dcm') ['ID'] |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
123 a = DoGet(orthanc, '/instances/%s/metadata/PixelDataOffset' % i) |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
124 if a != 0x03a0: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
125 raise Exception('Internal error') |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
126 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
127 a = DoGet(orthanc, '/instances/%s/attachments' % i) |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
128 if len(a) != 1 and len(a) != 2 or not 'dicom' in a: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
129 raise Exception('Internal error') |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
130 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
131 DoDelete(orthanc, '/instances/%s' % i) |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
132 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
133 if len(a) == 1: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
134 return False |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
135 elif 'dicom-until-pixel-data' in a: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
136 return True |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
137 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
138 raise Exception('Internal error') |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
139 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
140 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
141 return False |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
142 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
143 |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
144 def CallMoveScu(args): |
|
231
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
145 try: |
|
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
146 subprocess.check_call(GetMoveScuCommand() + args, |
|
318
bac7cc80f240
dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
315
diff
changeset
|
147 stderr = subprocess.PIPE) |
|
231
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
148 except subprocess.CalledProcessError as e: |
|
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
149 # The error code "69" corresponds to "EXITCODE_CMOVE_ERROR", |
|
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
150 # that has been introduced in DCMTK 3.6.2. This error code is |
|
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
151 # expected by some tests that try and C-MOVE non-existing |
|
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
152 # DICOM instances. |
|
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
153 # https://groups.google.com/d/msg/orthanc-users/DCRc5NeSCbM/DG-pSWj-BwAJ |
|
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
154 if e.returncode != 69: |
|
4087505ddfe3
catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
220
diff
changeset
|
155 raise e |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
156 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
157 |
|
51
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
158 def GenerateTestSequence(): |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
159 return [ |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
160 { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
161 'StudyDescription': 'Hello^', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
162 'ReferencedStudySequence' : [ |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
163 { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
164 'StudyDescription': 'Toto', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
165 }, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
166 { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
167 'StudyDescription': 'Tata', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
168 }, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
169 ] |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
170 }, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
171 { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
172 'StudyDescription': 'Sébastien^', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
173 'StudyDate' : '19700202', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
174 } |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
175 ] |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
176 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
177 |
| 3 | 178 class Orthanc(unittest.TestCase): |
| 179 def setUp(self): | |
| 83 | 180 if (sys.version_info >= (3, 0)): |
| 181 # Remove annoying warnings about unclosed socket in Python 3 | |
| 182 import warnings | |
| 183 warnings.simplefilter("ignore", ResourceWarning) | |
| 184 | |
| 508 | 185 print('running : %s' % self.id()) |
| 186 | |
| 3 | 187 DropOrthanc(_LOCAL) |
| 188 DropOrthanc(_REMOTE) | |
| 174 | 189 UninstallLuaCallbacks(_REMOTE) |
|
423
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
190 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
191 # Reset stuff possibly set by some integration tests |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
192 DoPut(_REMOTE, '/tools/default-encoding', 'Latin1') |
|
515
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
193 if IsOrthancVersionAbove(_REMOTE, 1, 9, 0): |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
194 DoPut(_REMOTE, '/tools/accepted-transfer-syntaxes', [ '1.2.840.10008.1.*' ]) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
195 DoPut(_REMOTE, '/tools/unknown-sop-class-accepted', '0') |
|
423
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
196 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
197 for i in [ 'toto', 'tata' ]: |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
198 if i in DoGet(_REMOTE, '/modalities'): |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
199 DoDelete(_REMOTE, '/modalities/%s' % i) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
200 if i in DoGet(_REMOTE, '/peers'): |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
201 DoDelete(_REMOTE, '/peers/%s' % i) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
202 |
| 312 | 203 #print("%s: In test %s" % (datetime.now(), self._testMethodName)) |
|
44
ffa542cce638
Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
204 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
205 def AssertSameImages(self, truth, url): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
206 im = GetImage(_REMOTE, url) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
207 self.assertTrue(CompareLists(truth, im.getdata())) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
208 |
| 3 | 209 |
| 210 def test_system(self): | |
| 177 | 211 self.assertTrue('Version' in DoGet(_REMOTE, '/system')) |
| 212 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 213 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 214 | |
| 512 | 215 systemInfo = DoGet(_REMOTE, '/system') |
| 216 | |
| 471 | 217 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 512 | 218 self.assertIn("MainDicomTags", systemInfo) |
| 219 self.assertIn("Patient", systemInfo["MainDicomTags"]) | |
| 220 self.assertIn("Study", systemInfo["MainDicomTags"]) | |
| 221 self.assertIn("Series", systemInfo["MainDicomTags"]) | |
| 222 self.assertIn("Instance", systemInfo["MainDicomTags"]) | |
| 223 | |
| 224 if IsOrthancVersionAbove(_REMOTE, 1, 12, 0): | |
| 225 self.assertIn("UserMetadata", systemInfo) | |
| 226 self.assertEqual(1098, systemInfo['UserMetadata']['my-metadata'] ) | |
| 227 | |
| 177 | 228 if systemInfo["Version"] == "mainline": |
|
463
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
229 print("Skipping version checks since you're currently in mainline") |
| 177 | 230 return |
| 231 | |
|
509
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
232 if not IsOrthancVersionAbove(_LOCAL, 0, 8, 7): |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
233 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 8, 6)) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
234 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 8, 7)) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
235 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 7, 6)) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
236 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 9, 6)) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
237 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 1, 8, 6)) |
| 3 | 238 |
| 456 | 239 |
| 512 | 240 |
| 3 | 241 def test_upload(self): |
| 173 | 242 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) |
| 243 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 244 | |
| 245 sizeDummyCT = 2472 | |
| 246 sizeOverwrite = 2476 | |
| 247 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d' | |
| 248 | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
249 # This file has *no* pixel data => "dicom-until-pixel-data" is not created |
| 3 | 250 u = UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
251 isCompressed = (DoGet(_REMOTE, '/instances/%s/attachments/dicom/is-compressed' % u['ID']) != 0) |
| 183 | 252 self.assertEqual(instance, u['ID']) |
| 3 | 253 self.assertEqual('Success', u['Status']) |
| 173 | 254 |
| 183 | 255 if True: |
| 256 # New test for Orthanc 1.4.3 | |
| 257 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', u['ParentSeries']) | |
| 258 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', u['ParentStudy']) | |
| 259 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', u['ParentPatient']) | |
| 260 | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
261 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
262 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json' % instance)) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
263 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/attachments/dicom-until-pixel-data' % instance)) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
264 j = 0 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
265 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
266 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/attachments/dicom-until-pixel-data' % instance)) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
267 j = int(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % instance)) |
|
445
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
268 |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
269 if IsOrthancVersionAbove(_REMOTE, 1, 10, 0): |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
270 attachmentInfo = DoGet(_REMOTE, '/instances/%s/attachments/dicom/info' % instance) |
| 447 | 271 |
| 272 if isCompressed: | |
| 273 self.assertGreater(sizeDummyCT, attachmentInfo['CompressedSize']) | |
| 274 else: | |
| 275 self.assertEqual(sizeDummyCT, attachmentInfo['CompressedSize']) | |
| 276 | |
|
445
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
277 self.assertEqual(sizeDummyCT, attachmentInfo['UncompressedSize']) |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
278 self.assertIn('Uuid', attachmentInfo) |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
279 self.assertEqual(1, attachmentInfo['ContentType']) |
|
09ebdee8eda2
added test for /attachments/../info
Alain Mazy <am@osimis.io>
parents:
443
diff
changeset
|
280 |
| 173 | 281 s = sizeDummyCT + j |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
282 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
283 if isCompressed: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
284 self.assertGreater(s, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
285 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
286 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
287 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
288 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 173 | 289 |
| 3 | 290 u = UploadInstance(_REMOTE, 'DummyCT.dcm') |
| 291 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 292 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 293 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 294 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
295 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
296 if isCompressed: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
297 self.assertGreater(s, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
298 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
299 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
300 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
301 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 173 | 302 |
| 303 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance) | |
| 3 | 304 self.assertEqual('20070101', i['StudyDate']) |
| 173 | 305 self.assertEqual('KNIX', i['PatientName']) |
| 306 | |
| 307 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2): | |
| 308 # Overwriting | |
| 309 self.assertEqual('Success', u['Status']) | |
| 310 else: | |
| 311 self.assertEqual('AlreadyStored', u['Status']) | |
| 312 | |
| 313 u = UploadInstance(_REMOTE, 'DummyCT-overwrite.dcm') | |
| 314 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 315 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 316 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 317 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 318 | |
| 319 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2): | |
| 320 # Overwriting | |
| 321 self.assertEqual('Success', u['Status']) | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
322 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
323 j2 = 0 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
324 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
325 j2 = int(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % instance)) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
326 self.assertNotEqual(j, j2) |
| 173 | 327 s2 = sizeOverwrite + j2 |
| 328 self.assertNotEqual(s, s2) | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
329 if isCompressed: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
330 self.assertGreater(s2, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
331 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
332 self.assertEqual(s2, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
333 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
334 self.assertEqual(s2, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 173 | 335 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance) |
| 336 self.assertEqual('ANOTHER', i['PatientName']) | |
| 337 else: | |
| 338 self.assertEqual('AlreadyStored', u['Status']) | |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
339 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
340 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 3 | 341 |
| 5 | 342 def test_upload_2(self): |
| 3 | 343 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
| 344 instance = DoGet(_REMOTE, '/instances/%s' % i) | |
| 345 self.assertEqual(i, instance['ID']) | |
| 346 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', | |
| 347 instance['MainDicomTags']['SOPInstanceUID']) | |
| 348 | |
| 349 series = DoGet(_REMOTE, '/series/%s' % instance['ParentSeries']) | |
| 350 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 351 series['MainDicomTags']['SeriesInstanceUID']) | |
| 352 | |
| 353 study = DoGet(_REMOTE, '/studies/%s' % series['ParentStudy']) | |
| 354 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 355 study['MainDicomTags']['StudyInstanceUID']) | |
| 356 | |
| 357 patient = DoGet(_REMOTE, '/patients/%s' % study['ParentPatient']) | |
| 358 self.assertEqual('ozp00SjY2xG', | |
| 359 patient['MainDicomTags']['PatientID']) | |
| 360 | |
| 361 dicom = DoGet(_REMOTE, '/instances/%s/file' % instance['ID']) | |
| 362 self.assertEqual(2472, len(dicom)) | |
| 363 self.assertEqual('3e29b869978b6db4886355a2b1132124', ComputeMD5(dicom)) | |
| 364 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 365 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/simplified-tags' % i)['StationName']) | |
| 366 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/tags' % i)['0008,1010']['Value']) | |
|
136
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
367 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)['StationName']) |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
368 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/tags?short' % i)['0008,1010']) |
| 3 | 369 |
| 370 | |
| 5 | 371 def test_images(self): |
| 372 i = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID'] | |
| 373 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 3 | 374 |
| 5 | 375 im = GetImage(_REMOTE, '/instances/%s/preview' % i) |
| 376 self.assertEqual("L", im.mode) | |
| 377 self.assertEqual(512, im.size[0]) | |
| 378 self.assertEqual(358, im.size[1]) | |
| 379 | |
| 380 im = GetImage(_REMOTE, '/instances/%s/image-uint8' % i) | |
| 381 self.assertEqual("L", im.mode) | |
| 382 self.assertEqual(512, im.size[0]) | |
| 383 self.assertEqual(358, im.size[1]) | |
| 384 | |
| 385 im = GetImage(_REMOTE, '/instances/%s/image-uint16' % i) | |
| 386 self.assertEqual(512, im.size[0]) | |
| 387 self.assertEqual(358, im.size[1]) | |
| 388 | |
| 389 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i) | |
| 390 self.assertEqual("L", im.mode) | |
| 391 self.assertEqual(512, im.size[0]) | |
| 392 self.assertEqual(358, im.size[1]) | |
| 393 | |
| 394 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint8' % i) | |
| 395 self.assertEqual("L", im.mode) | |
| 396 self.assertEqual(512, im.size[0]) | |
| 397 self.assertEqual(358, im.size[1]) | |
| 398 | |
| 399 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint16' % i) | |
| 400 self.assertEqual(512, im.size[0]) | |
| 401 self.assertEqual(358, im.size[1]) | |
| 64 | 402 |
| 403 # This is Little Endian Explicit | |
| 404 self.assertEqual('1.2.840.10008.1.2.1', DoGet(_REMOTE, '/instances/%s/header?simplify' % i)['TransferSyntaxUID']) | |
| 405 | |
|
464
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
406 def test_images_implicit_vr(self): |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
407 if IsOrthancVersionAbove(_REMOTE, 1, 10, 2): |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
408 i = UploadInstance(_REMOTE, 'Implicit-vr-us-palette.dcm')['ID'] |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
409 |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
410 im = GetImage(_REMOTE, '/instances/%s/preview' % i) |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
411 self.assertEqual("RGB", im.mode) |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
412 self.assertEqual(800, im.size[0]) |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
413 self.assertEqual(600, im.size[1]) |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
414 |
|
216231c18c2e
added tests for implicit vr preview
Alain Mazy <am@osimis.io>
parents:
463
diff
changeset
|
415 |
| 6 | 416 def test_hierarchy(self): |
| 417 UploadFolder(_REMOTE, 'Brainix/Epi') | |
| 418 UploadFolder(_REMOTE, 'Brainix/Flair') | |
| 419 UploadFolder(_REMOTE, 'Knee/T1') | |
| 420 UploadFolder(_REMOTE, 'Knee/T2') | |
| 421 | |
| 422 p = DoGet(_REMOTE, '/patients') | |
| 423 s = DoGet(_REMOTE, '/studies') | |
| 424 t = DoGet(_REMOTE, '/series') | |
| 425 self.assertEqual(2, len(p)) | |
| 426 self.assertEqual(2, len(s)) | |
| 427 self.assertEqual(4, len(t)) | |
| 428 self.assertEqual(94, len(DoGet(_REMOTE, '/instances'))) | |
| 429 | |
| 430 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0' | |
| 431 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' | |
| 432 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8' | |
| 433 brainixFlair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' | |
| 434 | |
| 435 kneePatient = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' | |
| 436 kneeStudy = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' | |
| 437 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' | |
| 438 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' | |
| 439 | |
| 440 self.assertTrue(brainixPatient in p) | |
| 441 self.assertTrue(kneePatient in p) | |
| 442 self.assertTrue(brainixStudy in s) | |
| 443 self.assertTrue(kneeStudy in s) | |
| 444 self.assertTrue(brainixEpi in t) | |
| 445 self.assertTrue(brainixFlair in t) | |
| 446 self.assertTrue(kneeT1 in t) | |
| 447 self.assertTrue(kneeT2 in t) | |
| 448 | |
| 449 self.assertEqual(44, len(DoGet(_REMOTE, '/patients/%s/instances' % brainixPatient))) | |
| 450 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % brainixPatient))) | |
| 451 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % brainixPatient))) | |
| 452 | |
| 453 self.assertEqual(50, len(DoGet(_REMOTE, '/patients/%s/instances' % kneePatient))) | |
| 454 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % kneePatient))) | |
| 455 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % kneePatient))) | |
| 456 | |
| 457 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % brainixStudy))) | |
| 458 self.assertEqual(44, len(DoGet(_REMOTE, '/studies/%s/instances' % brainixStudy))) | |
| 459 | |
| 460 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % kneeStudy))) | |
| 461 self.assertEqual(50, len(DoGet(_REMOTE, '/studies/%s/instances' % kneeStudy))) | |
| 462 | |
| 463 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixEpi))) | |
| 464 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixFlair))) | |
| 465 self.assertEqual(24, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT1))) | |
| 466 self.assertEqual(26, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT2))) | |
| 467 | |
| 468 for patient in p: | |
| 469 for study in DoGet(_REMOTE, '/patients/%s/studies' % patient): | |
| 470 self.assertEqual(patient, study['ParentPatient']) | |
| 471 for series in DoGet(_REMOTE, '/studies/%s/series' % study['ID']): | |
| 472 self.assertEqual(study['ID'], series['ParentStudy']) | |
| 211 | 473 self.assertEqual('Unknown', series['Status']) |
| 6 | 474 for instance in DoGet(_REMOTE, '/series/%s/instances' % series['ID']): |
| 475 self.assertEqual(series['ID'], instance['ParentSeries']) | |
| 476 | |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
477 if not IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
478 # The "dicom-as-json" attachment was removed in Orthanc 1.9.1 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
479 self.assertEqual(json.dumps(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/data' % instance['ID'])), |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
480 json.dumps(DoGet(_REMOTE, '/instances/%s/tags' % instance['ID']))) |
| 6 | 481 |
| 482 | |
| 483 r = DoDelete(_REMOTE, "/studies/%s" % brainixStudy)['RemainingAncestor'] | |
| 484 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 485 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 486 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 487 self.assertEqual(50, len(DoGet(_REMOTE, '/instances'))) | |
| 488 self.assertEqual(None, r) | |
| 489 | |
| 490 r = DoDelete(_REMOTE, "/series/%s" % kneeT2)['RemainingAncestor'] | |
| 491 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 492 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 493 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 494 self.assertEqual(24, len(DoGet(_REMOTE, '/instances'))) | |
| 495 self.assertEqual('Study', r['Type']) | |
| 496 self.assertEqual(kneeStudy, r['ID']) | |
| 497 | |
| 498 r = DoDelete(_REMOTE, "/instances/%s" % DoGet(_REMOTE, '/instances')[0])['RemainingAncestor'] | |
| 499 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 500 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 501 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 502 self.assertEqual(23, len(DoGet(_REMOTE, '/instances'))) | |
| 503 self.assertEqual('Series', r['Type']) | |
| 504 self.assertEqual(kneeT1, r['ID']) | |
| 505 | |
| 506 r = DoDelete(_REMOTE, "/patients/%s" % kneePatient)['RemainingAncestor'] | |
| 507 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 508 self.assertEqual(0, len(DoGet(_REMOTE, '/studies'))) | |
| 509 self.assertEqual(0, len(DoGet(_REMOTE, '/series'))) | |
| 510 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 511 self.assertEqual(None, r) | |
| 512 | |
| 513 DropOrthanc(_REMOTE) | |
| 514 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 515 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 7 | 516 |
|
213
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
517 def test_delete_cascade(self): |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
518 # make sure deleting the last instance of a study deletes the series, study and patient |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
519 |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
520 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) # make sure orthanc is empty when starting the test |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
521 a = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
522 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
523 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
524 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
525 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
526 |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
527 DoDelete(_REMOTE, '/instances/%s' % a) |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
528 |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
529 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
530 self.assertEqual(0, len(DoGet(_REMOTE, '/series'))) |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
531 self.assertEqual(0, len(DoGet(_REMOTE, '/studies'))) |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
532 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
533 |
| 7 | 534 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
535 def test_multiframe(self): |
| 7 | 536 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] |
| 537 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 538 | |
| 539 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i) | |
| 540 self.assertEqual("L", im.mode) | |
| 541 self.assertEqual(512, im.size[0]) | |
| 542 self.assertEqual(512, im.size[1]) | |
| 543 | |
| 544 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint8' % i) | |
| 545 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint16' % i) | |
| 546 DoGet(_REMOTE, '/instances/%s/frames/75/preview' % i) | |
| 547 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/aaa/preview' % i)) | |
| 548 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/76/preview' % i)) | |
| 549 | |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
550 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
551 def test_changes(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
552 # Check emptiness |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
553 c = DoGet(_REMOTE, '/changes') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
554 self.assertEqual(0, len(c['Changes'])) |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
555 #self.assertEqual(0, c['Last']) # Not true anymore for Orthanc >= 1.5.2 |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
556 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
557 c = DoGet(_REMOTE, '/changes?last') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
558 self.assertEqual(0, len(c['Changes'])) |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
559 #self.assertEqual(0, c['Last']) # Not true anymore for Orthanc >= 1.5.2 |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
560 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
561 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
562 # Add 1 instance |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
563 i = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
564 c = DoGet(_REMOTE, '/changes') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
565 begin = c['Last'] |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
566 self.assertEqual(4, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
567 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
568 self.assertEqual(c['Changes'][-1]['Seq'], c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
569 |
|
390
5c2472f008eb
Check the order in which the creation events are reported
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
389
diff
changeset
|
570 # Check the order in which the creation events are reported |
|
5c2472f008eb
Check the order in which the creation events are reported
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
389
diff
changeset
|
571 self.assertEqual(c['Changes'][0]['ChangeType'], 'NewInstance') |
|
5c2472f008eb
Check the order in which the creation events are reported
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
389
diff
changeset
|
572 self.assertEqual(c['Changes'][1]['ChangeType'], 'NewSeries') |
|
5c2472f008eb
Check the order in which the creation events are reported
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
389
diff
changeset
|
573 self.assertEqual(c['Changes'][2]['ChangeType'], 'NewStudy') |
|
5c2472f008eb
Check the order in which the creation events are reported
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
389
diff
changeset
|
574 self.assertEqual(c['Changes'][3]['ChangeType'], 'NewPatient') |
|
5c2472f008eb
Check the order in which the creation events are reported
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
389
diff
changeset
|
575 |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
576 c = DoGet(_REMOTE, '/changes?last') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
577 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
578 self.assertEqual(begin, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
579 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
580 c = DoGet(_REMOTE, '/changes?limit=1&since=' + str(begin - 1)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
581 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
582 self.assertEqual(begin, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
583 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
584 c = DoGet(_REMOTE, '/changes?limit=1&since=' + str(begin - 2)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
585 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
586 self.assertEqual(begin - 1, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
587 self.assertFalse(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
588 c = DoGet(_REMOTE, '/changes?limit=1&since=' + str(begin - 3)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
589 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
590 self.assertEqual(begin - 2, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
591 self.assertFalse(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
592 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
593 UploadFolder(_REMOTE, 'Knee/T1') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
594 UploadFolder(_REMOTE, 'Knee/T2') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
595 since = begin |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
596 countPatients = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
597 countStudies = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
598 countSeries = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
599 countInstances = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
600 completed = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
601 while True: |
| 530 | 602 c = DoGet(_REMOTE, '/changes', { 'since' : since, 'limit' : 1000 }) |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
603 since = c['Last'] |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
604 for i in c['Changes']: |
| 530 | 605 # We have set StableAge to 1 -> we might have StabeStudy but this is not sure -> detect only the 'New' events |
| 606 | |
| 607 if i['ResourceType'] == 'Instance' and i['ChangeType'] == 'NewInstance': | |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
608 countInstances += 1 |
| 530 | 609 if i['ResourceType'] == 'Patient' and i['ChangeType'] == 'NewPatient': |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
610 countPatients += 1 |
| 530 | 611 if i['ResourceType'] == 'Study' and i['ChangeType'] == 'NewStudy': |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
612 countStudies += 1 |
| 530 | 613 if i['ResourceType'] == 'Series' and i['ChangeType'] == 'NewSeries': |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
614 countSeries += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
615 if i['ChangeType'] == 'CompletedSeries': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
616 completed += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
617 self.assertTrue('ID' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
618 self.assertTrue('Path' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
619 self.assertTrue('Seq' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
620 if c['Done']: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
621 break |
| 530 | 622 # we count only the events since before the upload of 2 Knee series ! |
| 623 self.assertEqual(50, countInstances) | |
| 624 self.assertEqual(1, countPatients) | |
| 625 self.assertEqual(1, countStudies) | |
| 626 self.assertEqual(2, countSeries) | |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
627 self.assertEqual(0, completed) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
628 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
629 |
|
644
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
630 def test_changes_extended(self): |
| 693 | 631 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedChanges(_REMOTE): |
|
644
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
632 # Check emptiness |
|
677
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
633 c = DoGet(_REMOTE, '/changes') |
|
644
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
634 self.assertEqual(0, len(c['Changes'])) |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
635 #self.assertEqual(0, c['Last']) # Not true anymore for Orthanc >= 1.5.2 |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
636 self.assertTrue(c['Done']) |
|
677
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
637 c = DoGet(_REMOTE, '/changes?last') |
|
644
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
638 self.assertEqual(0, len(c['Changes'])) |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
639 #self.assertEqual(0, c['Last']) # Not true anymore for Orthanc >= 1.5.2 |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
640 self.assertTrue(c['Done']) |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
641 |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
642 # Add 1 instance |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
643 i = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] |
|
677
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
644 c = DoGet(_REMOTE, '/changes') |
|
644
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
645 begin = c['Last'] |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
646 self.assertEqual(4, len(c['Changes'])) |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
647 self.assertTrue(c['Done']) |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
648 self.assertEqual(c['Changes'][-1]['Seq'], c['Last']) |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
649 |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
650 # Check the order in which the creation events are reported |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
651 self.assertEqual(c['Changes'][0]['ChangeType'], 'NewInstance') |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
652 self.assertEqual(c['Changes'][1]['ChangeType'], 'NewSeries') |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
653 self.assertEqual(c['Changes'][2]['ChangeType'], 'NewStudy') |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
654 self.assertEqual(c['Changes'][3]['ChangeType'], 'NewPatient') |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
655 |
|
677
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
656 c = DoGet(_REMOTE, '/changes?type=NewInstance') |
|
644
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
657 self.assertEqual(1, len(c['Changes'])) |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
658 self.assertEqual(begin-3, c['Last']) |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
659 |
|
677
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
660 c = DoGet(_REMOTE, '/changes?type=NewPatient') |
|
644
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
661 self.assertEqual(1, len(c['Changes'])) |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
662 self.assertEqual(begin, c['Last']) |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
663 |
| 697 | 664 c = DoGet(_REMOTE, '/changes?type=NewPatient;NewInstance') |
| 665 self.assertEqual(2, len(c['Changes'])) | |
| 666 self.assertEqual(begin, c['Last']) | |
| 667 | |
|
644
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
668 UploadFolder(_REMOTE, 'Knee/T1') |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
669 UploadFolder(_REMOTE, 'Knee/T2') |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
670 |
|
677
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
671 # Request the 1000 first NewInstance changes -> all 50 shall be reported |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
672 c = DoGet(_REMOTE, '/changes', { 'type': 'NewInstance', 'since' : begin, 'limit' : 1000 }) |
|
644
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
673 self.assertEqual(50, len(c['Changes'])) |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
674 self.assertLess(begin, c['Changes'][0]['Seq']) |
|
677
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
675 self.assertTrue(c['Done']) #w e have got them all so it's DONE |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
676 lastFrom1000NewInstances = c['Last'] |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
677 firstFrom1000NewInstances = c['First'] |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
678 self.assertLess(firstFrom1000NewInstances, lastFrom1000NewInstances) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
679 |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
680 # Only the 10 first NewInstance changes -> only 10 shall be reported |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
681 c = DoGet(_REMOTE, '/changes', { 'type': 'NewInstance', 'since' : begin, 'limit' : 10 }) |
|
644
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
682 self.assertEqual(10, len(c['Changes'])) |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
683 self.assertFalse(c['Done']) |
|
677
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
684 lastFrom10firstNewInstances = c['Last'] |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
685 firstFrom10firstNewInstances = c['First'] |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
686 self.assertLess(firstFrom10firstNewInstances, lastFrom10firstNewInstances) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
687 self.assertLess(lastFrom10firstNewInstances, lastFrom1000NewInstances) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
688 self.assertEqual(firstFrom10firstNewInstances, firstFrom1000NewInstances) |
|
644
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
689 |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
690 # between begin and begin+10 with a max of 10 and a filter -> less than 10 NewInstance since there are other changes in this range |
|
677
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
691 c = DoGet(_REMOTE, '/changes', { 'type': 'NewInstance', 'since' : begin, 'to': begin+10, 'limit' : 10 }) |
|
644
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
692 self.assertLess(len(c['Changes']), 10) |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
693 self.assertTrue(c['Done']) # we have received ALL NewInstance that are between since and to so we consider it's done |
|
677
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
694 lastFrom10SubsetNewInstances = c['Last'] |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
695 firstFrom10SubsetNewInstances = c['First'] |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
696 self.assertLess(firstFrom10SubsetNewInstances, lastFrom10SubsetNewInstances) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
697 self.assertLess(lastFrom10SubsetNewInstances, lastFrom10firstNewInstances) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
698 self.assertEqual(firstFrom10SubsetNewInstances, firstFrom1000NewInstances) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
699 |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
700 # test with only 'to' -> all 50 NewInstance shall be reported |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
701 c = DoGet(_REMOTE, '/changes', { 'type': 'NewInstance', 'to': lastFrom1000NewInstances, 'limit' : 50 }) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
702 self.assertEqual(lastFrom1000NewInstances, c['Changes'][-1]['Seq']) |
|
644
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
703 self.assertEqual(50, len(c['Changes'])) |
|
677
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
704 self.assertFalse(c['Done']) # Done can not be used when working in reverse direction |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
705 lastFrom50Reverse = c['Last'] |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
706 firstFrom50Reverse = c['First'] |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
707 self.assertLess(firstFrom50Reverse, lastFrom50Reverse) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
708 self.assertEqual(lastFrom50Reverse, lastFrom1000NewInstances) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
709 self.assertEqual(firstFrom50Reverse, firstFrom1000NewInstances) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
710 |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
711 # test with only 'to' and limit to 10 NewInstance changes |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
712 c = DoGet(_REMOTE, '/changes', { 'type': 'NewInstance', 'to': lastFrom1000NewInstances, 'limit' : 10 }) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
713 self.assertEqual(lastFrom1000NewInstances, c['Changes'][-1]['Seq']) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
714 self.assertEqual(10, len(c['Changes'])) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
715 self.assertFalse(c['Done']) # Done can not be used when working in reverse direction |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
716 lastFrom10Reverse = c['Last'] |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
717 firstFrom10Reverse = c['First'] |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
718 self.assertLess(firstFrom10Reverse, lastFrom10Reverse) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
719 self.assertEqual(lastFrom10Reverse, lastFrom1000NewInstances) |
|
599ff47f609d
updated extended /changes tests
Alain Mazy <am@orthanc.team>
parents:
644
diff
changeset
|
720 self.assertLessEqual(firstFrom50Reverse, firstFrom10Reverse) |
|
644
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
721 |
|
5806bd442a37
new tests for /extended-api-v1/changes
Alain Mazy <am@orthanc.team>
parents:
640
diff
changeset
|
722 |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
723 def test_archive(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
724 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
|
725 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') |
|
582
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
726 kneePatient = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
727 kneeStudy = DoGet(_REMOTE, '/studies')[0] |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
728 kneeSeries = DoGet(_REMOTE, '/series')[0] |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
729 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
730 z = GetArchive(_REMOTE, '/patients/%s/archive' % kneePatient) |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
731 self.assertEqual(2, len(z.namelist())) |
|
582
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
732 self.assertIn('887 KNEE/A10003245599 IRM DU GENOU/MR T1W_aTSE/MR000000.dcm', z.namelist()) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
733 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
734 z = GetArchive(_REMOTE, '/studies/%s/archive' % kneeStudy) |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
735 self.assertEqual(2, len(z.namelist())) |
|
582
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
736 self.assertIn('887 KNEE/A10003245599 IRM DU GENOU/MR T1W_aTSE/MR000000.dcm', z.namelist()) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
737 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
738 z = GetArchive(_REMOTE, '/series/%s/archive' % kneeSeries) |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
739 self.assertEqual(1, len(z.namelist())) |
|
583
b9dffa48f74a
fix to keep backward behaviour when exporting a series archive
Alain Mazy <am@osimis.io>
parents:
582
diff
changeset
|
740 self.assertIn('887 KNEE/A10003245599 IRM DU GENOU/MR T1W_aTSE/MR000000.dcm', z.namelist()) |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
741 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
742 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') |
|
582
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
743 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0' |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
744 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
745 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
746 z = GetArchive(_REMOTE, '/patients/%s/archive' % kneePatient) |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
747 self.assertEqual(2, len(z.namelist())) |
| 192 | 748 |
|
582
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
749 # archive with 2 patients |
| 192 | 750 z = PostArchive(_REMOTE, '/tools/create-archive', { |
|
582
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
751 'Resources' : [ brainixPatient, kneePatient ] |
| 192 | 752 }) |
| 753 self.assertEqual(3, len(z.namelist())) | |
|
582
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
754 self.assertIn('5Yp0E BRAINIX/0 IRM crbrale neurocrne/MR sT2WFLAIR/MR000000.dcm', z.namelist()) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
755 self.assertIn('887 KNEE/A10003245599 IRM DU GENOU/MR T1W_aTSE/MR000000.dcm', z.namelist()) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
756 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
757 z = PostArchive(_REMOTE, '/patients/%s/archive' % kneePatient, { |
|
403
e08e15befa0c
test sync POST to /archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
758 'Synchronous' : True |
|
e08e15befa0c
test sync POST to /archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
759 }) |
|
e08e15befa0c
test sync POST to /archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
402
diff
changeset
|
760 self.assertEqual(2, len(z.namelist())) |
|
582
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
761 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
762 # archive with 2 studies |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
763 z = PostArchive(_REMOTE, '/tools/create-archive', { |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
764 'Resources' : [ brainixStudy, kneeStudy ] |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
765 }) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
766 self.assertEqual(3, len(z.namelist())) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
767 self.assertIn('5Yp0E BRAINIX/0 IRM crbrale neurocrne/MR sT2WFLAIR/MR000000.dcm', z.namelist()) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
768 self.assertIn('887 KNEE/A10003245599 IRM DU GENOU/MR T1W_aTSE/MR000000.dcm', z.namelist()) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
769 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
770 # archive with 1 patient & 1 study |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
771 z = PostArchive(_REMOTE, '/tools/create-archive', { |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
772 'Resources' : [ brainixPatient, kneeStudy ] |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
773 }) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
774 self.assertEqual(3, len(z.namelist())) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
775 self.assertIn('5Yp0E BRAINIX/0 IRM crbrale neurocrne/MR sT2WFLAIR/MR000000.dcm', z.namelist()) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
776 self.assertIn('887 KNEE/A10003245599 IRM DU GENOU/MR T1W_aTSE/MR000000.dcm', z.namelist()) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
777 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
778 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
779 def test_archive_with_patient_ids_collision(self): |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
780 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2): |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
781 # one PatientID: COMMON |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
782 # 2 PatientName: HELLO & WORLD |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
783 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
784 hello = UploadInstance(_REMOTE, 'PatientIdsCollision/Image1.dcm') |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
785 world = UploadInstance(_REMOTE, 'PatientIdsCollision/Image2.dcm') |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
786 helloStudy = hello['ParentStudy'] |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
787 worldStudy = world['ParentStudy'] |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
788 helloPatient = hello['ParentPatient'] |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
789 worldPatient = world['ParentPatient'] |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
790 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
791 self.assertEqual(helloPatient, worldPatient) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
792 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
793 # when downloading the Patient, we do not really know what PatientName we will get in the zip |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
794 z = GetArchive(_REMOTE, '/patients/%s/archive' % helloPatient) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
795 self.assertEqual(2, len(z.namelist())) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
796 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
797 # when downloading studies individually, we want to have the PatientName that appears in the study |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
798 z = GetArchive(_REMOTE, '/studies/%s/archive' % helloStudy) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
799 self.assertEqual(1, len(z.namelist())) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
800 self.assertIn('COMMON HELLO/HELLO SERIES/Unknown Series/00000000.dcm', z.namelist()) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
801 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
802 z = GetArchive(_REMOTE, '/studies/%s/archive' % worldStudy) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
803 self.assertEqual(1, len(z.namelist())) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
804 self.assertIn('COMMON WORLD/WORLD SERIES/Unknown Series/00000000.dcm', z.namelist()) |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
805 |
|
615201c822d8
new test for PatientName used when exporting an archive
Alain Mazy <am@osimis.io>
parents:
573
diff
changeset
|
806 |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
807 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
808 def test_media_archive(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
809 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
|
810 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
|
811 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
812 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
|
813 self.assertEqual(3, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
814 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
|
815 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
|
816 self.assertTrue('DICOMDIR' in z.namelist()) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
817 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
818 try: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
819 os.remove('/tmp/DICOMDIR') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
820 except: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
821 # The file does not exist |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
822 pass |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
823 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
824 z.extract('DICOMDIR', '/tmp') |
| 45 | 825 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
|
826 stderr = subprocess.STDOUT).split('\n') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
827 self.assertEqual(3, len(a)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
828 self.assertTrue(a[0].startswith('Warning')) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
829 self.assertEqual('BasicDirectory', a[1]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
830 self.assertEqual('', a[2]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
831 |
| 45 | 832 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
|
833 stderr = subprocess.STDOUT).split('\n') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
834 self.assertEqual(1, len(a)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
835 self.assertEqual('', a[0]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
836 |
| 45 | 837 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
|
838 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
|
839 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
|
840 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
841 os.remove('/tmp/DICOMDIR') |
| 10 | 842 |
| 843 | |
| 844 def test_protection(self): | |
| 845 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 846 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 847 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 848 a = DoGet(_REMOTE, '/patients')[0] | |
| 849 b = DoGet(_REMOTE, '/patients')[1] | |
| 850 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 851 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain') | |
| 852 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 853 DoPut(_REMOTE, '/patients/%s/protected' % a, '1', 'text/plain') | |
| 854 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 855 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain') | |
| 856 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 857 | |
| 858 | |
| 12 | 859 def test_raw_tags(self): |
| 10 | 860 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] |
| 861 | |
| 862 dicom = DoGet(_REMOTE, '/instances/%s/file' % i) | |
| 863 self.assertEqual('1a7c56cb02d6e742cc9c856a8ac182e3', ComputeMD5(dicom)) | |
| 864 | |
| 865 s = '/instances/%s/content/' % i | |
| 866 | |
| 867 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, s + '0008-1010').strip()) | |
| 868 self.assertRaises(Exception, lambda: DoGet(_REMOTE, s + '0008-1011')) | |
| 869 | |
| 870 self.assertEqual('Abdomen', DoGet(_REMOTE, s + '7fe1-1001/0/7fe1-1008/0/7fe1-1057').strip()) | |
| 871 self.assertEqual('cla_3c', DoGet(_REMOTE, s + '7fe1-1001/0/7fe1-1008/8/7fe1-1057').strip()) | |
| 872 | |
| 873 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 874 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 875 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 876 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 877 | |
| 878 for i in DoGet(_REMOTE, '/instances'): | |
| 879 aid = DoGet(_REMOTE, '/instances/%s' % i)['MainDicomTags']['SOPInstanceUID'] | |
| 880 self.assertEqual(aid, DoGet(_REMOTE, '/instances/%s/content/0008-0018' % i).replace(chr(0), '')) | |
| 881 | |
| 882 | |
| 883 def test_raw_tags_mdn(self): | |
| 884 # Bug reported by Cyril Paulus | |
| 885 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] | |
| 886 self.assertAlmostEqual(0.000027, DoGet(_REMOTE, '/instances/%s/content/7053-1000' % i)) | |
| 887 | |
| 888 | |
| 889 def test_modify_instance(self): | |
| 890 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] | |
| 891 modified = DoPost(_REMOTE, '/instances/%s/modify' % i, | |
| 892 json.dumps({ | |
| 893 "Replace" : { | |
| 894 "PatientName" : "hello", | |
| 895 #"PatientID" : "world" | |
| 896 }, | |
| 897 "Remove" : [ "StationName" ], | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
898 "RemovePrivateTags" : True |
| 10 | 899 }), |
| 900 'application/json') | |
| 901 j = DoPost(_REMOTE, '/instances', modified, 'application/dicom')['ID'] | |
| 902 | |
| 903 self.assertNotEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 904 #self.assertNotEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % i).strip()) | |
| 83 | 905 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i).strip()) |
| 10 | 906 DoGet(_REMOTE, '/instances/%s/content/6003-1010' % i) # Some private tag |
| 907 | |
| 908 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 909 #self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % j).strip()) | |
| 910 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j)) | |
| 911 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/6003-1010' % j)) | |
| 912 | |
| 913 | |
| 914 def test_modify_series(self): | |
| 915 # Upload 4 images from the same series | |
| 916 for i in range(4): | |
| 917 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 918 | |
| 919 origSeries = DoGet(_REMOTE, '/series')[0] | |
| 920 newSeries = DoPost(_REMOTE, '/series/%s/modify' % origSeries, | |
| 921 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 922 'application/json')['ID'] | |
| 923 | |
| 924 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['ModifiedFrom']) | |
| 925 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances'] | |
| 926 self.assertEqual(4, len(instances)) | |
| 927 for i in instances: | |
| 928 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom'] | |
| 929 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 930 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 931 | |
| 932 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 933 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 934 | |
| 935 | |
| 936 def test_modify_study(self): | |
| 937 # Upload 4 images from the 2 series of the same study | |
| 938 for i in range(4): | |
| 939 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 940 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 941 | |
| 942 origStudy = DoGet(_REMOTE, '/studies')[0] | |
| 943 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy, | |
| 944 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 945 'application/json')['ID'] | |
| 946 | |
| 947 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['ModifiedFrom']) | |
| 948 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series'] | |
| 949 self.assertEqual(2, len(series)) | |
| 950 for s in series: | |
| 951 ss = DoGet(_REMOTE, '/series/%s' % s)['ModifiedFrom'] | |
| 952 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy']) | |
| 953 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy']) | |
| 954 | |
| 955 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances'] | |
| 956 for i in instances: | |
| 957 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom'] | |
| 958 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 959 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 960 | |
| 961 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 962 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 963 | |
| 964 | |
| 965 def test_anonymize_series(self): | |
| 966 # Upload 4 images from the same series | |
| 967 for i in range(4): | |
| 968 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 969 | |
| 970 origSeries = DoGet(_REMOTE, '/series')[0] | |
| 971 newSeries = DoPost(_REMOTE, '/series/%s/anonymize' % origSeries, | |
| 972 '{}', | |
| 973 'application/json')['ID'] | |
| 974 | |
| 975 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['AnonymizedFrom']) | |
| 976 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances'] | |
| 977 self.assertEqual(4, len(instances)) | |
| 978 for i in instances: | |
| 979 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom'] | |
| 980 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 981 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 982 | |
| 983 DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j) | |
| 984 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i)) | |
| 985 | |
| 986 | |
| 987 def test_anonymize_study(self): | |
| 988 # Upload 4 images from the 2 series of the same study | |
| 989 for i in range(4): | |
| 990 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 991 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 992 | |
| 993 origStudy = DoGet(_REMOTE, '/studies')[0] | |
| 994 newStudy = DoPost(_REMOTE,'/studies/%s/anonymize' % origStudy, | |
| 995 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 996 'application/json')['ID'] | |
| 997 | |
| 998 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['AnonymizedFrom']) | |
| 999 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series'] | |
| 1000 self.assertEqual(2, len(series)) | |
| 1001 for s in series: | |
| 1002 ss = DoGet(_REMOTE, '/series/%s' % s)['AnonymizedFrom'] | |
| 1003 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy']) | |
| 1004 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy']) | |
| 1005 | |
| 1006 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances'] | |
| 1007 for i in instances: | |
| 1008 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom'] | |
| 1009 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 1010 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 1011 | |
| 1012 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 1013 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 11 | 1014 |
| 1015 | |
| 1016 | |
| 1017 def test_storescu(self): | |
| 1018 # Check emptiness | |
| 1019 e = DoGet(_REMOTE, '/exports') | |
| 1020 self.assertEqual(0, len(e['Exports'])) | |
| 1021 self.assertEqual(0, e['Last']) | |
| 1022 self.assertTrue(e['Done']) | |
| 1023 e = DoGet(_REMOTE, '/exports?last') | |
| 1024 self.assertEqual(0, len(e['Exports'])) | |
| 1025 self.assertEqual(0, e['Last']) | |
| 1026 self.assertTrue(e['Done']) | |
| 1027 | |
| 1028 # Add 1 instance | |
| 1029 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1030 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 1031 | |
| 1032 # Export the instance | |
| 1033 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') # instance | |
| 1034 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 1035 self.assertEqual(1, len(DoGet(_LOCAL, '/studies'))) | |
| 1036 self.assertEqual(1, len(DoGet(_LOCAL, '/series'))) | |
| 1037 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 1038 | |
| 1039 e = DoGet(_REMOTE, '/exports') | |
| 1040 self.assertEqual(1, len(e['Exports'])) | |
| 1041 self.assertTrue(e['Done']) | |
| 1042 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 1043 e = DoGet(_REMOTE, '/exports?limit=1') | |
| 1044 self.assertEqual(1, len(e['Exports'])) | |
| 1045 self.assertTrue(e['Done']) | |
| 1046 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 1047 e = DoGet(_REMOTE, '/exports?last') | |
| 1048 self.assertEqual(1, len(e['Exports'])) | |
| 1049 self.assertTrue(e['Done']) | |
| 1050 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 1051 seqInstance = e['Last'] | |
| 1052 | |
| 1053 # Export the series | |
| 1054 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', 'text/plain') | |
| 1055 | |
| 1056 e = DoGet(_REMOTE, '/exports') | |
| 1057 self.assertEqual(2, len(e['Exports'])) | |
| 1058 self.assertTrue(e['Done']) | |
| 1059 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 1060 seqSeries = e['Last'] | |
| 1061 self.assertNotEqual(seqInstance, seqSeries) | |
| 1062 e = DoGet(_REMOTE, '/exports?limit=1&since=0') | |
| 1063 self.assertEqual(1, len(e['Exports'])) | |
| 1064 self.assertFalse(e['Done']) | |
| 1065 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance) | |
| 1066 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance)) | |
| 1067 self.assertEqual(1, len(e['Exports'])) | |
| 1068 self.assertTrue(e['Done']) | |
| 1069 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 1070 e = DoGet(_REMOTE, '/exports?last') | |
| 1071 self.assertEqual(1, len(e['Exports'])) | |
| 1072 self.assertTrue(e['Done']) | |
| 1073 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 1074 | |
| 1075 # Export the study | |
| 1076 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', 'text/plain') | |
| 1077 seqStudy = DoGet(_REMOTE, '/exports')['Last'] | |
| 1078 | |
| 1079 # Export the patient | |
| 1080 j = DoPost(_REMOTE, '/modalities/orthanctest/store', '6816cb19-844d5aee-85245eba-28e841e6-2414fae2', 'text/plain') | |
| 1081 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 1082 self.assertEqual(1, len(DoGet(_LOCAL, '/studies'))) | |
| 1083 self.assertEqual(1, len(DoGet(_LOCAL, '/series'))) | |
| 1084 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 1085 | |
| 1086 e = DoGet(_REMOTE, '/exports') | |
| 1087 self.assertEqual(4, len(e['Exports'])) | |
| 1088 self.assertTrue(e['Done']) | |
| 1089 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 1090 seqPatient = e['Last'] | |
| 1091 self.assertNotEqual(seqInstance, seqSeries) | |
| 1092 self.assertNotEqual(seqSeries, seqStudy) | |
| 1093 self.assertNotEqual(seqStudy, seqPatient) | |
| 1094 self.assertTrue(seqInstance < seqSeries) | |
| 1095 self.assertTrue(seqSeries < seqStudy) | |
| 1096 self.assertTrue(seqStudy < seqPatient) | |
| 1097 e = DoGet(_REMOTE, '/exports?limit=1&since=0') | |
| 1098 self.assertEqual(1, len(e['Exports'])) | |
| 1099 self.assertFalse(e['Done']) | |
| 1100 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance) | |
| 1101 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance)) | |
| 1102 self.assertEqual(1, len(e['Exports'])) | |
| 1103 self.assertFalse(e['Done']) | |
| 1104 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 1105 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqSeries)) | |
| 1106 self.assertEqual(1, len(e['Exports'])) | |
| 1107 self.assertFalse(e['Done']) | |
| 1108 self.assertEqual(e['Exports'][-1]['Seq'], seqStudy) | |
| 1109 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqStudy)) | |
| 1110 self.assertEqual(1, len(e['Exports'])) | |
| 1111 self.assertTrue(e['Done']) | |
| 1112 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient) | |
| 1113 e = DoGet(_REMOTE, '/exports?last') | |
| 1114 self.assertEqual(1, len(e['Exports'])) | |
| 1115 self.assertTrue(e['Done']) | |
| 1116 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient) | |
| 1117 | |
| 1118 | |
| 1119 # Check the content of the logged information | |
| 1120 e = DoGet(_REMOTE, '/exports')['Exports'] | |
| 1121 | |
| 1122 if 'PatientID' in e[0]: | |
| 1123 # Since Orthanc 0.8.6 | |
| 1124 patient = 'PatientID' | |
| 1125 study = 'StudyInstanceUID' | |
| 1126 series = 'SeriesInstanceUID' | |
| 1127 instance = 'SOPInstanceUID' | |
| 1128 else: | |
| 1129 # Up to Orthanc 0.8.5 | |
| 1130 patient = 'PatientId' | |
| 1131 study = 'StudyInstanceUid' | |
| 1132 series = 'SeriesInstanceUid' | |
| 1133 instance = 'SopInstanceUid' | |
| 1134 | |
| 1135 for k in range(4): | |
| 1136 self.assertTrue('Date' in e[k]) | |
| 1137 self.assertTrue('Seq' in e[k]) | |
| 1138 self.assertEqual('orthanctest', e[k]['RemoteModality']) | |
| 1139 | |
| 1140 self.assertEqual(10, len(e[0])) | |
| 1141 self.assertEqual('Instance', e[0]['ResourceType']) | |
| 1142 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['ID']) | |
| 1143 self.assertEqual('/instances/66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['Path']) | |
| 1144 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', e[0][instance]) | |
| 1145 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', e[0][series]) | |
| 1146 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[0][study]) | |
| 1147 self.assertEqual('ozp00SjY2xG', e[0][patient]) | |
| 1148 | |
| 1149 self.assertEqual(9, len(e[1])) | |
| 1150 self.assertEqual('Series', e[1]['ResourceType']) | |
| 1151 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['ID']) | |
| 1152 self.assertEqual('/series/f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['Path']) | |
| 1153 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', e[1][series]) | |
| 1154 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[1][study]) | |
| 1155 self.assertEqual('ozp00SjY2xG', e[1][patient]) | |
| 1156 | |
| 1157 self.assertEqual(8, len(e[2])) | |
| 1158 self.assertEqual('Study', e[2]['ResourceType']) | |
| 1159 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['ID']) | |
| 1160 self.assertEqual('/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['Path']) | |
| 1161 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[2][study]) | |
| 1162 self.assertEqual('ozp00SjY2xG', e[2][patient]) | |
| 1163 | |
| 1164 self.assertEqual(7, len(e[3])) | |
| 1165 self.assertEqual('Patient', e[3]['ResourceType']) | |
| 1166 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['ID']) | |
| 1167 self.assertEqual('/patients/6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['Path']) | |
| 1168 self.assertEqual('ozp00SjY2xG', e[3][patient]) | |
| 1169 | |
| 1170 DropOrthanc(_REMOTE) | |
| 1171 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 1172 | |
| 1173 | |
| 1174 def test_store_peer(self): | |
| 1175 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports'])) | |
| 1176 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 1177 | |
| 1178 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1179 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 1180 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1181 | |
| 1182 j = DoPost(_REMOTE, '/peers/peer/store', str(i), 'text/plain') | |
| 1183 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 1184 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1185 | |
| 1186 self.assertEqual(1, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 1187 | |
| 1188 DropOrthanc(_REMOTE) | |
| 1189 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 1190 | |
| 1191 | |
| 1192 def test_bulk_storescu(self): | |
| 1193 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 1194 | |
| 1195 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1196 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 1197 | |
| 1198 j = DoPost(_REMOTE, '/modalities/orthanctest/store', [ a['ID'], b['ID'] ], 'application/json') | |
| 1199 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) | |
| 1200 | |
| 1201 DropOrthanc(_LOCAL) | |
| 1202 | |
| 1203 # Send using patient's UUID | |
| 1204 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 1205 j = DoPost(_REMOTE, '/modalities/orthanctest/store', | |
| 1206 [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ], 'application/json') | |
| 1207 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) | |
| 1208 | |
| 1209 | |
| 1210 def test_color(self): | |
| 1211 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID'] | |
| 1212 im = GetImage(_REMOTE, '/instances/%s/preview' % i) | |
| 1213 self.assertEqual("RGB", im.mode) | |
| 1214 self.assertEqual(41, im.size[0]) | |
| 1215 self.assertEqual(41, im.size[1]) | |
| 1216 | |
| 1217 # http://effbot.org/zone/pil-comparing-images.htm | |
| 13 | 1218 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png')) |
| 11 | 1219 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None) |
| 1220 | |
| 1221 | |
| 12 | 1222 def test_faking_ruby_put(self): |
| 1223 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1224 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 1225 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 1226 a = DoGet(_REMOTE, '/patients')[0] | |
| 1227 b = DoGet(_REMOTE, '/patients')[1] | |
| 1228 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1229 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0') | |
| 1230 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1231 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '1') | |
| 1232 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1233 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0') | |
| 1234 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1235 | |
| 1236 | |
| 1237 def test_faking_ruby_delete(self): | |
| 1238 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1239 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 1240 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 1241 a = DoGet(_REMOTE, '/patients')[0] | |
| 1242 b = DoGet(_REMOTE, '/patients')[1] | |
| 1243 DoGet(_REMOTE, '/patients/%s' % a, data = { '_method' : 'DELETE' }) | |
| 1244 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1245 DoGet(_REMOTE, '/patients/%s' % b, data = { '_method' : 'DELETE' }) | |
| 1246 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 1247 | |
| 1248 | |
| 1249 def test_faking_google_put(self): | |
| 1250 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1251 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 1252 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 1253 a = DoGet(_REMOTE, '/patients')[0] | |
| 1254 b = DoGet(_REMOTE, '/patients')[1] | |
| 1255 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1256 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '0') | |
| 1257 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1258 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '1') | |
| 1259 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1260 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '0') | |
| 1261 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 1262 | |
| 1263 | |
| 1264 def test_faking_google_delete(self): | |
| 1265 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1266 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 1267 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 1268 a = DoGet(_REMOTE, '/patients')[0] | |
| 1269 b = DoGet(_REMOTE, '/patients')[1] | |
| 1270 DoPost(_REMOTE, '/patients/%s' % a, headers = { 'X-HTTP-Method-Override' : 'DELETE' }) | |
| 1271 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1272 DoPost(_REMOTE, '/patients/%s' % b, headers = { 'X-HTTP-Method-Override' : 'DELETE' }) | |
| 1273 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 1274 | |
| 1275 | |
| 1276 def test_lua(self): | |
| 1277 self.assertEqual(42, DoPost(_REMOTE, '/tools/execute-script', 'print(42)')) | |
| 1278 self.assertTrue(IsDefinedInLua(_REMOTE, 'PrintRecursive')) | |
| 1279 self.assertFalse(IsDefinedInLua(_REMOTE, 'HelloWorld')) | |
| 1280 | |
| 1281 | |
| 1282 def test_metadata(self): | |
| 1283 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1284 p = DoGet(_REMOTE, '/patients')[0] | |
| 1285 i = DoGet(_REMOTE, '/instances')[0] | |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1286 series = DoGet(_REMOTE, '/series')[0] |
| 12 | 1287 |
| 1288 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) | |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1289 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1290 self.assertEqual(2, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1291 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1292 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1293 self.assertEqual(1, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1294 self.assertTrue('LastUpdate' in m) |
| 12 | 1295 |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1296 # 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
|
1297 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
|
1298 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
|
1299 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
|
1300 |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1301 m = DoGet(_REMOTE, '/studies/%s/metadata' % DoGet(_REMOTE, '/studies')[0]) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1302 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1303 self.assertEqual(2, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1304 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1305 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1306 self.assertEqual(1, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1307 self.assertTrue('LastUpdate' in m) |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1308 |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1309 m = DoGet(_REMOTE, '/series/%s/metadata' % series) |
|
732
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
1310 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5): |
| 691 | 1311 self.assertEqual(4, len(m)) |
| 1312 self.assertTrue('MainDicomSequences' in m) # since RequestAttributeSequence is now in the MainDicomTags | |
| 1313 elif IsOrthancVersionAbove(_REMOTE, 1, 11, 0): | |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1314 self.assertEqual(3, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1315 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1316 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1317 self.assertEqual(2, len(m)) |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1318 self.assertTrue('LastUpdate' in m) |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1319 |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1320 # New in Orthanc 1.9.0 |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1321 self.assertTrue('RemoteAET' in m) |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1322 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
|
1323 |
| 12 | 1324 m = DoGet(_REMOTE, '/instances/%s/metadata' % i) |
|
554
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
1325 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1326 self.assertEqual(10, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1327 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1328 self.assertEqual(9, len(m)) |
|
547
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1329 else: |
|
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1330 self.assertEqual(8, len(m)) |
|
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1331 |
|
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1332 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1333 self.assertTrue('MainDicomTagsSignature' in m) |
|
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1334 |
|
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1335 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1336 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
|
1337 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
|
1338 |
| 12 | 1339 self.assertTrue('IndexInSeries' in m) |
| 1340 self.assertTrue('ReceptionDate' in m) | |
| 1341 self.assertTrue('RemoteAET' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1342 self.assertTrue('Origin' in m) |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
1343 self.assertTrue('TransferSyntax' in m) |
|
95
a807a4699eb4
testing of metadata SopClassUid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
1344 self.assertTrue('SopClassUid' in m) |
| 145 | 1345 self.assertTrue('RemoteIP' in m) |
| 1346 self.assertTrue('HttpUsername' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1347 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
|
1348 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
|
1349 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
|
1350 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
|
1351 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i), '1.2.840.10008.5.1.4.1.1.4') |
| 12 | 1352 |
| 1353 # Play with custom metadata | |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1354 (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
|
1355 self.assertEqual('200', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1356 self.assertEqual('', body) |
|
394
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1357 |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1358 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
|
1359 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
|
1360 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1361 self.assertFalse('ETag' in headers) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1362 self.assertFalse('etag' in headers) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1363 |
| 12 | 1364 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1365 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1366 self.assertEqual(3, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1367 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1368 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1369 self.assertEqual(2, len(m)) |
| 12 | 1370 self.assertTrue('LastUpdate' in m) |
| 1371 self.assertTrue('5555' in m) | |
| 1372 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
|
1373 |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1374 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2): |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1375 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
|
1376 'If-Match' : headers['etag'] |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1377 }) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1378 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1379 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'hello') |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1380 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1381 (headers, body) = DoGetRaw(_REMOTE, '/patients/%s/metadata/5555' % p) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1382 self.assertEqual('200', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
1383 self.assertEqual('hello', body) |
|
394
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1384 |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1385 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2): |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1386 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p, headers = { |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1387 'If-Match' : headers['etag'] |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1388 }) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1389 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1390 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1391 |
| 12 | 1392 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1393 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1394 self.assertEqual(2, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1395 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1396 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1397 self.assertEqual(1, len(m)) |
| 12 | 1398 self.assertTrue('LastUpdate' in m) |
| 13 | 1399 |
| 1400 | |
| 1401 def test_statistics(self): | |
| 1402 # Upload 16 instances | |
| 1403 for i in range(4): | |
| 1404 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 1405 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 1406 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 1407 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 1408 | |
| 1409 s = DoGet(_REMOTE, '/statistics') | |
| 1410 self.assertEqual(16, s['CountInstances']) | |
| 1411 self.assertEqual(2, s['CountPatients']) | |
| 1412 self.assertEqual(2, s['CountStudies']) | |
| 1413 self.assertEqual(4, s['CountSeries']) | |
| 1414 d = int(s['TotalUncompressedSize']) | |
| 1415 | |
| 1416 e = 0 | |
| 1417 for patient in DoGet(_REMOTE, '/patients'): | |
| 1418 s = DoGet(_REMOTE, '/patients/%s/statistics' % patient) | |
| 1419 self.assertEqual(8, s['CountInstances']) | |
| 1420 self.assertEqual(1, s['CountStudies']) | |
| 1421 self.assertEqual(2, s['CountSeries']) | |
| 1422 e += int(s['UncompressedSize']) | |
| 1423 | |
| 1424 for study in DoGet(_REMOTE, '/studies'): | |
| 1425 s = DoGet(_REMOTE, '/studies/%s/statistics' % study) | |
| 1426 self.assertEqual(8, s['CountInstances']) | |
| 1427 self.assertEqual(2, s['CountSeries']) | |
| 1428 e += int(s['UncompressedSize']) | |
| 1429 | |
| 1430 for series in DoGet(_REMOTE, '/series'): | |
| 1431 s = DoGet(_REMOTE, '/series/%s/statistics' % series) | |
| 1432 self.assertEqual(4, s['CountInstances']) | |
| 1433 e += int(s['UncompressedSize']) | |
| 1434 | |
| 1435 self.assertEqual(3 * d, e) | |
| 1436 | |
| 1437 | |
| 1438 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
|
1439 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
|
1440 |
| 13 | 1441 patient = DoGet(_REMOTE, '/patients')[0] |
| 1442 instance = DoGet(_REMOTE, '/instances')[0] | |
| 1443 size = int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']) | |
| 1444 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1445 | |
| 1446 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) | |
| 1447 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
|
1448 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1449 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
|
1450 if IsDicomUntilPixelDataStored(_REMOTE): |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1451 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
|
1452 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
|
1453 |
|
448
63f475995400
Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
447
diff
changeset
|
1454 # New in Orthanc 1.10.0 |
|
443
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1455 a = DoGet(_REMOTE, '/instances/%s/attachments?full' % instance) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1456 self.assertEqual(2, len(a)) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1457 self.assertEqual(1, a['dicom']) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1458 self.assertEqual(3, a['dicom-until-pixel-data']) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1459 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1460 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1461 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
|
1462 |
|
448
63f475995400
Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
447
diff
changeset
|
1463 # New in Orthanc 1.10.0 |
|
443
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1464 a = DoGet(_REMOTE, '/instances/%s/attachments?full' % instance) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1465 self.assertEqual(1, len(a)) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1466 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
|
1467 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
1468 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
|
1469 self.assertTrue('dicom-as-json' in DoGet(_REMOTE, '/instances/%s/attachments' % instance)) |
| 13 | 1470 |
|
448
63f475995400
Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
447
diff
changeset
|
1471 # New in Orthanc 1.10.0 |
|
443
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1472 self.assertRaises(Exception, lambda: DoGet( |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1473 _REMOTE, '/instances/%s/attachments?full' % instance)) |
|
97fca09bf849
test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
442
diff
changeset
|
1474 |
| 13 | 1475 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/patients/%s/attachments/22' % patient, 'hello')) |
| 1476 hello = 'hellohellohellohellohellohellohellohellohello' | |
| 1477 DoPut(_REMOTE, '/patients/%s/attachments/1025' % patient, hello) | |
| 1478 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1479 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1480 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1481 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient))) | |
| 1482 | |
| 1483 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world') | |
| 1484 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1485 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1486 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1487 size + | |
| 1488 int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient)) + | |
| 1489 int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient))) | |
| 1490 | |
| 1491 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) | |
| 1492 self.assertEqual(hello, DoGet(_REMOTE, '/patients/%s/attachments/1025/data' % patient)) | |
| 1493 self.assertEqual('world', DoGet(_REMOTE, '/patients/%s/attachments/1026/data' % patient)) | |
| 1494 DoPost(_REMOTE, '/patients/%s/attachments/1025/verify-md5' % patient) | |
| 1495 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
|
1496 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
|
1497 'If-Match' : '0-%s' % ComputeMD5('world'), |
|
392
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
1498 }) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
1499 |
|
394
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1500 (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
|
1501 self.assertEqual('200', headers['status']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
1502 self.assertEqual('world2', body) |
| 13 | 1503 |
| 1504 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
|
1505 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
|
1506 'If-Match' : '0-%s' % ComputeMD5(hello), |
|
392
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
1507 }) |
| 13 | 1508 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), |
| 1509 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1510 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1511 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient))) | |
| 1512 | |
| 1513 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
|
1514 |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1515 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2): |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1516 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient, headers = { |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1517 'If-Match' : headers['etag'] |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1518 }) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1519 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1520 self.assertFalse('etag' in headers) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1521 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
1522 |
| 13 | 1523 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) |
| 1524 | |
| 1525 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), size) | |
| 1526 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1527 | |
| 1528 | |
| 1529 def test_incoming_storescu(self): | |
| 1530 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 45 | 1531 subprocess.check_call([ FindExecutable('storescu'), |
|
44
ffa542cce638
Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
1532 _REMOTE['Server'], str(_REMOTE['DicomPort']), |
| 13 | 1533 GetDatabasePath('ColorTestImageJ.dcm') ]) |
| 1534 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1535 | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1536 i = DoGet(_REMOTE, '/instances') |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1537 self.assertEqual(1, len(i)) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1538 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
|
1539 |
|
554
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
1540 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1541 self.assertEqual(10, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1542 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1543 self.assertEqual(9, len(m)) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1544 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
1545 self.assertEqual(8, len(m)) |
|
547
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1546 |
|
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1547 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1548 self.assertTrue('MainDicomTagsSignature' in m) # New in Orthanc 1.11.0 |
|
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1549 |
|
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1550 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1551 self.assertTrue('PixelDataOffset' in m) # New in Orthanc 1.9.1 |
|
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1552 self.assertEqual(2242, DoGet(_REMOTE, '/instances/%s/metadata/PixelDataOffset' % i[0])) |
|
7de5fd295025
testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
543
diff
changeset
|
1553 |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1554 self.assertTrue('IndexInSeries' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1555 self.assertTrue('ReceptionDate' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1556 self.assertTrue('RemoteAET' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1557 self.assertTrue('Origin' in m) |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
1558 self.assertTrue('TransferSyntax' in m) |
|
95
a807a4699eb4
testing of metadata SopClassUid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
1559 self.assertTrue('SopClassUid' in m) |
| 145 | 1560 self.assertTrue('RemoteIP' in m) |
| 1561 self.assertTrue('CalledAET' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1562 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
|
1563 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
|
1564 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
|
1565 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
|
1566 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
|
1567 |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1568 series = DoGet(_REMOTE, '/series')[0] |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1569 m = DoGet(_REMOTE, '/series/%s/metadata' % series) |
|
732
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
1570 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5): |
| 691 | 1571 self.assertEqual(4, len(m)) |
| 1572 self.assertTrue('MainDicomSequences' in m) # since RequestAttributeSequence is now in the MainDicomTags | |
| 1573 elif IsOrthancVersionAbove(_REMOTE, 1, 11, 0): | |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1574 self.assertEqual(3, len(m)) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1575 self.assertTrue('MainDicomTagsSignature' in m) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1576 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
1577 self.assertEqual(2, len(m)) |
|
369
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1578 self.assertTrue('LastUpdate' in m) |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1579 self.assertTrue('RemoteAET' in m) |
|
24d93b42873a
test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
368
diff
changeset
|
1580 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
|
1581 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
|
1582 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
|
1583 |
| 13 | 1584 |
| 1585 def test_incoming_findscu(self): | |
| 1586 UploadInstance(_REMOTE, 'Multiframe.dcm') | |
| 1587 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') | |
| 1588 | |
| 1589 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', '0010,0010' ]) | |
| 1590 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) | |
| 1591 self.assertEqual(2, len(patientNames)) | |
| 1592 self.assertTrue('Test Patient BG ' in patientNames) | |
| 1593 self.assertTrue('Anonymized' in patientNames) | |
| 1594 | |
| 668 | 1595 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', '0010,0010=*' ]) |
| 1596 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) | |
| 1597 self.assertEqual(2, len(patientNames)) | |
| 1598 self.assertTrue('Test Patient BG ' in patientNames) | |
| 1599 self.assertTrue('Anonymized' in patientNames) | |
| 1600 | |
| 13 | 1601 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,0021' ]) |
| 1602 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i) | |
| 1603 self.assertEqual(2, len(series)) | |
| 1604 self.assertTrue('20070208' in series) | |
| 1605 self.assertTrue('19980312' in series) | |
| 1606 | |
|
335
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
1607 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
|
1608 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1609 self.assertEqual(1, len(series)) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1610 self.assertTrue('19980312' in series) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1611 |
| 13 | 1612 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=Anonymized' ]) |
| 1613 series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i) | |
| 1614 self.assertEqual(1, len(series)) | |
| 1615 | |
| 1616 # Test the "CaseSentitivePN" flag (false by default) | |
| 1617 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=anonymized' ]) | |
| 1618 series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i) | |
| 1619 self.assertEqual(1, len(series)) | |
|
66
821d9eb73c45
Test returning sequence values
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
1620 |
| 70 | 1621 # Test range search (buggy if Orthanc <= 0.9.6) |
| 1622 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-' ]) | |
| 1623 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1624 self.assertEqual(2, len(studies)) | |
| 1625 self.assertTrue('20070208' in studies) | |
| 1626 self.assertTrue('19980312' in studies) | |
| 1627 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-19980312' ]) | |
| 1628 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1629 self.assertEqual(1, len(studies)) | |
| 1630 self.assertTrue('19980312' in studies) | |
| 1631 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=-19980312' ]) | |
| 1632 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1633 self.assertEqual(1, len(studies)) | |
| 1634 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
|
1635 |
|
05f48c19c60d
Test "Retrieve AE Title" is returned by C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
324
diff
changeset
|
1636 # 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
|
1637 # 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
|
1638 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
|
1639 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
|
1640 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
|
1641 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
|
1642 self.assertEqual('ORTHANC', instances[1].strip()) |
| 13 | 1643 |
| 1644 | |
|
191
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1645 def test_incoming_findscu_2(self): |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1646 # This test fails if "LookupMode_DatabaseOnly" is used |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1647 # (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
|
1648 # DICOM tags are returned) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1649 UploadInstance(_REMOTE, 'Multiframe.dcm') |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1650 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1651 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1652 # 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
|
1653 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
|
1654 sequences = re.findall('\(0008,2112\)', i) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1655 self.assertEqual(1, len(sequences)) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1656 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1657 # Test returning a non-main DICOM tag, |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1658 # "SecondaryCaptureDeviceID" (0018,1010), whose value is |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1659 # "MEDPC" in "ColorTestImageJ.dcm" |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1660 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0018,1010' ]) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1661 tags = re.findall('\(0018,1010\).*MEDPC', i) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1662 self.assertEqual(1, len(tags)) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1663 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1664 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1665 def test_incoming_findscu_3(self): |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1666 # This test fails if "LookupMode_DatabaseOnly" or |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1667 # "LookupMode_DiskOnAnswer" is used, as |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1668 # "SecondaryCaptureDeviceID" (0018,1010) is not a main DICOM |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1669 # 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
|
1670 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1671 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1672 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
|
1673 sequences = re.findall('\(0018,1010\)', i) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1674 self.assertEqual(1, len(sequences)) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1675 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1676 |
| 13 | 1677 def test_incoming_movescu(self): |
| 1678 UploadInstance(_REMOTE, 'Multiframe.dcm') | |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1679 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1680 # No matching patient, so no job is created |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1681 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1682 CallMoveScu([ '--patient', '-k', '0008,0052=PATIENT', '-k', 'PatientID=none' ]) |
| 13 | 1683 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1684 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1685 # 1 Matching patient, track the job |
| 138 | 1686 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
| 1687 '--patient', | |
| 1688 '-k', '0008,0052=PATIENT', | |
| 1689 '-k', 'PatientID=12345678' | |
| 1690 ]))) | |
| 13 | 1691 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) |
| 1692 | |
| 1693 | |
| 1694 def test_findscu(self): | |
| 1695 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1696 j = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] | |
| 1697 k = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] | |
| 1698 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 1699 | |
| 1700 # Test the "find-patient" level | |
| 1701 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }) | |
| 1702 self.assertEqual(1, len(p)) | |
| 1703 self.assertEqual('ozp00SjY2xG', p[0]['PatientID']) | |
| 1704 | |
| 1705 # Test wildcards constraints. The "LO" value representation | |
| 1706 # for PatientID is always case-sensitive, but the "PN" for | |
| 1707 # PatientName might depend on the implementation: | |
| 1708 # "GenerateConfigurationForTests.py" will force it to be case | |
| 1709 # insensitive (which was the default until Orthanc 0.8.6). | |
| 1710 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'K*' }) | |
| 1711 self.assertEqual(1, len(p)) | |
| 1712 | |
| 1713 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'k*' }) | |
| 1714 self.assertEqual(1, len(p)) | |
| 1715 | |
| 1716 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'ozp*' }) | |
| 1717 self.assertEqual(1, len(p)) | |
| 1718 | |
| 1719 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'o?p*' }) | |
| 1720 self.assertEqual(1, len(p)) | |
| 1721 | |
| 1722 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : '0?q*' }) | |
| 1723 self.assertEqual(0, len(p)) | |
| 1724 | |
| 1725 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'B*' }) | |
| 1726 self.assertEqual(0, len(p)) | |
| 1727 | |
| 1728 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'b*' }) | |
| 1729 self.assertEqual(0, len(p)) | |
| 1730 | |
| 1731 DoPost(_REMOTE, '/modalities/orthanctest/store', str(j), 'text/plain') | |
| 1732 DoPost(_REMOTE, '/modalities/orthanctest/store', str(k), 'text/plain') | |
| 1733 DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }) | |
| 1734 self.assertEqual(3, len(DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }))) | |
| 1735 | |
| 1736 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'A*' }) | |
| 1737 self.assertEqual(2, len(p)) | |
| 1738 | |
| 1739 # Test the "find-study" level. This is the instance "ColorTestImageJ.dcm" | |
| 1740 s = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ' }) | |
| 1741 self.assertEqual(1, len(s)) | |
| 1742 self.assertEqual('20070208', s[0]['StudyDate']) | |
| 1743 | |
| 1744 # Test range searches | |
| 1745 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1746 'StudyDate' : '-20070101' }) | |
| 1747 self.assertEqual(0, len(t)) | |
| 1748 | |
| 1749 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1750 'StudyDate' : '20090101-' }) | |
| 1751 self.assertEqual(0, len(t)) | |
| 1752 | |
| 1753 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1754 'StudyDate' : '20070101-' }) | |
| 1755 self.assertEqual(1, len(t)) | |
| 1756 | |
| 1757 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1758 'StudyDate' : '-20090101' }) | |
| 1759 self.assertEqual(1, len(t)) | |
| 1760 | |
| 1761 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1762 'StudyDate' : '20070207-20070207' }) | |
| 1763 self.assertEqual(0, len(t)) | |
| 1764 | |
| 1765 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1766 'StudyDate' : '20070208-20070208' }) | |
| 1767 self.assertEqual(1, len(t)) | |
| 1768 | |
| 1769 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1770 'StudyDate' : '20070209-20070209' }) | |
| 1771 self.assertEqual(0, len(t)) | |
| 1772 | |
| 1773 # Test the ModalitiesInStudy tag | |
| 1774 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1775 'PatientID' : 'B9uTHKOZ', | |
| 1776 'ModalitiesInStudy' : 'US' }) | |
| 1777 self.assertEqual(0, len(t)) | |
| 1778 | |
| 1779 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1780 'PatientID' : 'B9uTHKOZ', | |
| 1781 'ModalitiesInStudy' : 'CT' }) | |
| 1782 self.assertEqual(1, len(t)) | |
| 1783 | |
| 1784 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1785 'PatientID' : 'B9uTHKOZ', | |
| 1786 'ModalitiesInStudy' : 'US\\CT' }) | |
| 1787 self.assertEqual(1, len(t)) | |
| 1788 | |
|
466
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1789 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { |
|
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1790 'PatientID' : 'B9uTHKOZ', |
|
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1791 'ModalitiesInStudy' : '' }) |
|
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1792 self.assertEqual(1, len(t)) |
|
28a2c9452ec9
extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents:
462
diff
changeset
|
1793 |
| 13 | 1794 # Test the "find-series" level |
| 1795 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1796 'PatientID' : 'B9uTHKOZ', | |
| 1797 'StudyInstanceUID' : s[0]['StudyInstanceUID'] }) | |
| 1798 self.assertEqual(1, len(t)) | |
| 1799 | |
| 1800 # Test "\" separator | |
| 1801 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1802 'PatientID' : 'B9uTHKOZ', | |
| 1803 'StudyInstanceUID' : s[0]['StudyInstanceUID'], | |
| 1804 'Modality' : 'MR\\CT\\US' }) | |
| 1805 self.assertEqual(1, len(t)) | |
| 1806 | |
| 1807 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1808 'PatientID' : 'B9uTHKOZ', | |
| 1809 'StudyInstanceUID' : s[0]['StudyInstanceUID'], | |
| 1810 'Modality' : 'MR\\US' }) | |
| 1811 self.assertEqual(0, len(t)) | |
| 1812 | |
| 1813 | |
| 1814 def test_update_modalities(self): | |
| 1815 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
|
1816 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/modalities/toto')) |
| 13 | 1817 DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000 ]) |
| 116 | 1818 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'MedInria' ]) # check backward compatiblity with obsolete manufacturer |
| 1819 DoDelete(_REMOTE, '/modalities/tata') | |
| 124 | 1820 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoUniversalWildcard' ]) |
|
121
1a19f953f53c
also test GenericNoWildcardInDates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
120
diff
changeset
|
1821 DoDelete(_REMOTE, '/modalities/tata') |
|
1a19f953f53c
also test GenericNoWildcardInDates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
120
diff
changeset
|
1822 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoWildcardInDates' ]) |
| 128 | 1823 modalitiesReadback = DoGet(_REMOTE, '/modalities?expand') |
|
182
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1824 self.assertEqual('STORESCP', modalitiesReadback['tata']['AET']) |
|
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1825 self.assertEqual('localhost', modalitiesReadback['tata']['Host']) |
|
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1826 self.assertEqual(2000, modalitiesReadback['tata']['Port']) |
|
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1827 self.assertEqual('GenericNoWildcardInDates', modalitiesReadback['tata']['Manufacturer']) |
| 116 | 1828 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000, 'InvalidManufacturerName' ])) |
| 13 | 1829 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/toto')) |
| 1830 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
|
1831 |
|
429cc9d03610
test access to the configuration of one single peer or modality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
350
diff
changeset
|
1832 # 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
|
1833 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
|
1834 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
|
1835 |
| 13 | 1836 DoDelete(_REMOTE, '/modalities/toto') |
| 1837 DoDelete(_REMOTE, '/modalities/tata') | |
| 1838 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto')) | |
| 1839 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/tata')) | |
| 1840 | |
|
584
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
1841 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2): |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
1842 self.assertEqual(DoGet(_REMOTE, '/modalities?expand'), DoGet(_REMOTE, '/modalities?expand=true')) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
1843 self.assertEqual(DoGet(_REMOTE, '/modalities'), DoGet(_REMOTE, '/modalities?expand=false')) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
1844 |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
1845 |
| 13 | 1846 |
| 1847 def test_update_peers(self): | |
| 1848 # curl -X PUT http://localhost:8042/peers/toto -d '["http://localhost:8042/"]' -v | |
| 1849 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
|
1850 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/peers/toto')) |
| 13 | 1851 DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/' ]) |
| 214 | 1852 DoPut(_REMOTE, '/peers/tata', { 'Url': 'http://localhost:8042/', |
| 1853 'Username': 'user', | |
| 1854 'Password' : 'pass', | |
| 1855 'RemoteSelf' : 'self' }) | |
| 128 | 1856 self.assertTrue('tata' in DoGet(_REMOTE, '/peers')) |
| 1857 peersReadback = DoGet(_REMOTE, '/peers?expand') | |
| 1858 self.assertEqual('http://localhost:8042/', peersReadback['tata']['Url']) | |
| 1859 self.assertEqual('user', peersReadback['tata']['Username']) | |
| 214 | 1860 |
| 1861 if IsOrthancVersionAbove(_REMOTE, 1, 5, 4): | |
| 1862 self.assertEqual(None, peersReadback['tata']['Password']) # make sure no sensitive data is included | |
| 1863 self.assertFalse(peersReadback['tata']['Pkcs11']) # make sure no sensitive data is included | |
| 1864 self.assertEqual('self', peersReadback['tata']['RemoteSelf']) | |
| 1865 else: | |
| 1866 self.assertFalse('Password' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1867 self.assertFalse('Pkcs11' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1868 self.assertFalse('RemoteSelf' in peersReadback['tata']) | |
| 1869 | |
| 128 | 1870 self.assertFalse('CertificateFile' in peersReadback['tata']) # make sure no sensitive data is included |
| 1871 self.assertFalse('CertificateKeyFile' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1872 self.assertFalse('CertificateKeyPassword' in peersReadback['tata']) # make sure no sensitive data is included | |
| 214 | 1873 |
| 13 | 1874 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a' ])) |
| 1875 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a', 'b', 'c' ])) | |
| 1876 self.assertTrue('store' in DoGet(_REMOTE, '/peers/toto')) | |
| 1877 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
|
1878 |
|
429cc9d03610
test access to the configuration of one single peer or modality
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
350
diff
changeset
|
1879 # 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
|
1880 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
|
1881 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
|
1882 |
| 13 | 1883 DoDelete(_REMOTE, '/peers/toto') |
| 1884 DoDelete(_REMOTE, '/peers/tata') | |
| 1885 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto')) | |
| 1886 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/tata')) | |
| 1887 | |
|
584
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
1888 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2): |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
1889 self.assertEqual(DoGet(_REMOTE, '/peers?expand'), DoGet(_REMOTE, '/peers?expand=true')) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
1890 self.assertEqual(DoGet(_REMOTE, '/peers'), DoGet(_REMOTE, '/peers?expand=false')) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
1891 |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
1892 |
| 13 | 1893 |
| 1894 def test_mesterhazy_modification(self): | |
| 1895 # When I modify a series ( eg. curl | |
| 1896 # http://localhost:8042/series/uidhere/modify -X POST -d | |
| 1897 # '{"Replace":{"SeriesDate":"19990101"}}' ) the modified | |
| 1898 # series is added to a new Study, instead of the existing | |
| 1899 # Study. Fixed in Orthanc 0.7.5 | |
| 1900 | |
| 1901 u = UploadInstance(_REMOTE, 'DummyCT.dcm') | |
| 1902 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' | |
| 1903 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 1904 | |
| 1905 modified = DoPost(_REMOTE, '/series/%s/modify' % series, | |
| 1906 json.dumps({ "Replace" : { "SeriesDate" : "19990101" }})) | |
| 1907 | |
| 1908 self.assertEqual(study, DoGet(_REMOTE, '/series/%s' % modified['ID']) ['ParentStudy']) | |
| 1909 | |
| 1910 | |
| 1911 def test_create(self): | |
| 685 | 1912 payload = { |
| 1913 'PatientName' : 'Jodogne', | |
| 1914 'Modality' : 'CT', | |
| 1915 'SOPClassUID' : '1.2.840.10008.5.1.4.1.1.1', | |
| 1916 'PixelData' : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==' # red dot in RGBA | |
| 1917 } | |
| 1918 | |
| 1919 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5): | |
| 687 | 1920 payload['TimeRange'] = '3.12\\4.12' # https://discourse.orthanc-server.org/t/multiplicity-on-dicom-tags/5144 |
| 685 | 1921 |
| 13 | 1922 i = DoPost(_REMOTE, '/tools/create-dicom', |
| 685 | 1923 json.dumps(payload)) |
| 13 | 1924 |
| 1925 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 1926 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip()) | |
| 682 | 1927 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i['ID']) |
| 686 | 1928 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5): |
| 1929 self.assertIn("3.12", tags["TimeRange"]) | |
| 1930 self.assertIn("4.12", tags["TimeRange"]) | |
| 1931 self.assertIn("\\", tags["TimeRange"]) | |
| 681 | 1932 |
| 1933 png = GetImage(_REMOTE, '/instances/%s/preview' % i['ID']) | |
| 1934 self.assertEqual((5, 5), png.size) | |
| 1935 | |
| 1936 j = DoGet(_REMOTE, i['Path']) | |
| 1937 self.assertEqual('Instance', j['Type']) | |
| 1938 self.assertEqual(j['ID'], i['ID']) | |
| 1939 | |
| 13 | 1940 |
| 1941 def test_pilates(self): | |
| 1942 # "SCU failed error when accessing orthanc with osirix" by | |
| 1943 # Pilates Agentur (Mar 10, 2014 at 9:33 PM) | |
| 1944 i = UploadInstance(_REMOTE, 'PilatesArgenturGEUltrasoundOsiriX.dcm')['ID'] | |
| 1945 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 1946 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 1947 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 1948 | |
| 1949 | |
| 1950 def test_shared_tags(self): | |
| 1951 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1952 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')['ID'] | |
| 1953 p = DoGet(_REMOTE, '/patients')[0] | |
| 1954 | |
| 1955 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1956 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
|
1957 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
|
1958 |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
1959 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
|
1960 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
|
1961 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
|
1962 |
| 13 | 1963 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) |
| 1964 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1965 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1966 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1967 self.assertFalse('0008,0018' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1968 self.assertFalse('SOPInstanceUID' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1969 | |
| 1970 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/tags' % a)) | |
| 1971 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/tags?simplify' % a)) | |
| 1972 | |
| 1973 | |
| 1974 def test_modules(self): | |
| 1975 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1976 p = DoGet(_REMOTE, '/patients')[0] | |
| 1977 s = DoGet(_REMOTE, '/studies')[0] | |
| 1978 t = DoGet(_REMOTE, '/series')[0] | |
| 1979 | |
| 1980 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/module' % p)) | |
| 1981 self.assertTrue('PatientName' in DoGet(_REMOTE, '/patients/%s/module?simplify' % p)) | |
| 1982 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/studies/%s/module-patient' % p)) | |
| 1983 self.assertTrue('PatientName' in DoGet(_REMOTE, '/studies/%s/module-patient?simplify' % p)) | |
| 1984 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/studies/%s/module' % s)) | |
| 1985 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/studies/%s/module?simplify' % s)) | |
| 1986 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/series/%s/module' % p)) | |
| 1987 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/series/%s/module?simplify' % p)) | |
| 1988 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/module' % a)) | |
| 1989 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/module?simplify' % a)) | |
| 1990 | |
| 1991 | |
| 1992 def test_auto_directory(self): | |
| 1993 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1994 self.assertTrue('now' in DoGet(_REMOTE, '/tools')) | |
| 1995 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
|
1996 self.assertTrue('invalidate-tags' in DoGet(_REMOTE, '/tools')) |
| 13 | 1997 self.assertTrue(len(DoGet(_REMOTE, '/tools/dicom-conformance')) > 1000) |
| 1998 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities')) | |
| 1999 self.assertTrue('echo' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 2000 self.assertTrue('find' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 2001 self.assertTrue('find-instance' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 2002 self.assertTrue('find-patient' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 2003 self.assertTrue('find-series' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 2004 self.assertTrue('find-study' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 2005 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 2006 self.assertTrue('store' in DoGet(_REMOTE, '/peers/peer')) | |
| 2007 self.assertTrue('matlab' in DoGet(_REMOTE, '/instances/%s/frames/0' % a)) | |
| 79 | 2008 self.assertTrue('raw' in DoGet(_REMOTE, '/instances/%s/frames/0' % a)) |
| 13 | 2009 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/tools/nope')) |
| 28 | 2010 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope')) |
| 2011 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope/nope.html')) | |
| 2012 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope')[0].status) | |
| 2013 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope/nope.html')[0].status) | |
| 13 | 2014 |
| 2015 | |
| 2016 def test_echo(self): | |
| 2017 DoPost(_REMOTE, '/modalities/orthanctest/echo') | |
|
359
8b476a383999
test empty body in /modalities/.../echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
357
diff
changeset
|
2018 DoPost(_REMOTE, '/modalities/orthanctest/echo', '{}') |
|
8b476a383999
test empty body in /modalities/.../echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
357
diff
changeset
|
2019 |
|
8b476a383999
test empty body in /modalities/.../echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
357
diff
changeset
|
2020 # 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
|
2021 DoPost(_REMOTE, '/modalities/orthanctest/echo', '') |
|
352
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
2022 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/nope/echo')) |
|
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
2023 |
|
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
2024 # New in Orthanc 1.8.1 |
|
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
2025 DoPost(_REMOTE, '/tools/dicom-echo', [ |
| 355 | 2026 _REMOTE['DicomAet'], _REMOTE['Server'], _REMOTE['DicomPort'] ]) |
|
352
3d406c0261fc
test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
351
diff
changeset
|
2027 DoPost(_REMOTE, '/tools/dicom-echo', DoGet(_REMOTE, '/modalities/orthanctest/configuration')) |
| 13 | 2028 |
| 353 | 2029 # Use the 'CheckFind' new option in Orthanc 1.8.1 |
| 2030 DoPost(_REMOTE, '/modalities/self/echo', { 'CheckFind' : True }) | |
| 2031 DoPost(_REMOTE, '/tools/dicom-echo', { | |
| 2032 'AET' : _REMOTE['DicomAet'], | |
| 2033 'Host' : _REMOTE['Server'], | |
| 2034 'Port' : _REMOTE['DicomPort'], | |
| 2035 'CheckFind' : True | |
| 2036 }) | |
| 2037 | |
| 13 | 2038 |
| 2039 def test_xml(self): | |
| 2040 json = DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/json' }) | |
| 2041 xml = minidom.parseString(DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/xml' })) | |
| 2042 items = xml.getElementsByTagName('root')[0].getElementsByTagName('item') | |
| 2043 self.assertEqual(len(items), len(json)) | |
| 2044 | |
| 2045 self.assertTrue('dicom-conformance' in json) | |
| 2046 | |
| 2047 ok = False | |
| 2048 for i in items: | |
| 2049 if i.childNodes[0].data == 'dicom-conformance': | |
| 2050 ok = True | |
| 2051 self.assertTrue(ok) | |
| 2052 | |
| 2053 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
2054 def test_googlecode_issue_16(self): |
| 13 | 2055 i = UploadInstance(_REMOTE, 'Issue16.dcm')['ID'] |
| 2056 t = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)['FrameIncrementPointer'] | |
| 2057 self.assertEqual('0018,1063', t) | |
| 2058 | |
| 2059 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
2060 def test_googlecode_issue_22(self): |
| 13 | 2061 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] |
| 2062 a = [ | |
| 2063 "f804691f62197040438f4627c6b994f1", # Frame 0 | |
| 2064 "c69eee9a51eea3e8611e82e578897254", | |
| 2065 "315666be83e2d0111c77bc0996d84901", | |
| 2066 "3e27aa959d911172c48a1436443c72b1", | |
| 2067 "958642c9e7e9d232d3869faff546058c", | |
| 2068 "5e7ea8e3e4230cae707d143481355c59", | |
| 2069 "eda37f83558d858a596175aed8b2ad47", | |
| 2070 "486713bd2895c4ecbe0e97715ac7f80a", | |
| 2071 "091ef729eb169e67da8a0faa9631f9a8", | |
| 2072 "5aa2b8c7ffe0a483efaa8e12417686ca", | |
| 2073 "e2f39e85896fe58876654b94cd0b5013", | |
| 2074 "6fd2129e4950abbe1be053bc814d5da8", | |
| 2075 "c3331a8ba7a757f3d423735ab7fa81f9", | |
| 2076 "746f808582156734dd6b6fdfd3a0b72c", | |
| 2077 "8075ea2b227a70c60ea6b7b75a6bb190", | |
| 2078 "806b8b3e300c615099c11a5ec23465aa", | |
| 2079 "7c836aa298ba6eef96434579af631a11", | |
| 2080 "a0357dc9f4f72d73a885c33d7c287446", | |
| 2081 "f25ba3be1cc7d7fad95706adc199ea7d", | |
| 2082 "8b114c526b8cbed6cad8a3248b7b480c", | |
| 2083 "44e6670f127e612a2b4aa60a0d207698", | |
| 2084 "b8945f90fe02facf2ace24ca1ecbe0a5", | |
| 2085 "95c796c2fa8f59018b15cf2987b1f79b", | |
| 2086 "ce0a51ab30224205b44920221dc27351", # Frame 23 | |
| 2087 ] | |
| 2088 | |
| 2089 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 2090 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/preview' % s)) | |
| 2091 | |
| 2092 for i in range(len(a)): | |
| 2093 self.assertEqual(a[i], ComputeMD5(DoGet(_REMOTE, '/instances/%s/frames/%d/preview' % (s, i)))) | |
| 2094 | |
| 2095 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
2096 def test_googlecode_issue_19(self): |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2097 # This is an image with "YBR_FULL" photometric interpretation, it is not supported by Orthanc |
| 13 | 2098 # gdcmconv -i /home/jodogne/DICOM/GdcmDatabase/US_DataSet/HDI5000_US/3EAF5E01 -w -o Issue19.dcm |
| 2099 | |
| 2100 a = UploadInstance(_REMOTE, 'Issue19.dcm')['ID'] | |
| 304 | 2101 if not HasGdcmPlugin(_REMOTE): |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
2102 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/941ad3c8-05d05b88-560459f9-0eae0e20-6cddd533/preview')) |
| 13 | 2103 |
| 2104 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
2105 def test_googlecode_issue_37(self): |
| 13 | 2106 # Same test for issues 35 and 37. Fixed in Orthanc 0.9.1 |
| 2107 u = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID'] | |
| 2108 | |
| 2109 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 2110 'CaseSensitive' : True, | |
| 2111 'Query' : { 'StationName' : 'SMR4-MP3' }}) | |
| 2112 self.assertEqual(1, len(a)) | |
| 14 | 2113 |
| 2114 | |
| 2115 def test_rest_find(self): | |
| 548 | 2116 # Upload 12 instances |
| 2117 for i in range(3): | |
| 14 | 2118 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) |
| 2119 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 2120 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 2121 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 2122 | |
| 548 | 2123 |
| 2124 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 2125 'CaseSensitive' : True, | |
| 2126 'Query' : { | |
| 2127 'PatientName' : '*NE*', | |
| 2128 'StudyDate': '20080819' | |
| 2129 }}) | |
| 2130 self.assertEqual(1, len(a)) | |
| 2131 | |
| 2132 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 2133 'CaseSensitive' : True, | |
| 2134 'Query' : { | |
| 2135 'PatientName' : '*NE*', | |
|
555
739cad709a8c
skipping DicomWeb test not implemented yet
Alain Mazy <am@osimis.io>
parents:
548
diff
changeset
|
2136 'PatientBirthDate': '20080101-20081231', |
| 548 | 2137 'PatientSex': '0000' |
| 2138 }}) | |
| 2139 self.assertEqual(1, len(a)) | |
| 2140 | |
| 2141 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 2142 'CaseSensitive' : True, | |
| 2143 'Query' : { | |
| 2144 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881' | |
| 2145 }}) | |
| 2146 self.assertEqual(2, len(a)) | |
| 2147 | |
| 2148 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', | |
| 2149 'CaseSensitive' : True, | |
| 2150 'Query' : { | |
| 2151 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881', | |
| 2152 'SeriesInstanceUID': '1.3.46.670589.11.17521.5.0.3124.2008081908564160709' | |
| 2153 }}) | |
| 2154 self.assertEqual(3, len(a)) | |
| 2155 | |
| 2156 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 2157 'CaseSensitive' : True, | |
| 2158 'Query' : { | |
| 2159 'StudyDate' : '20080818-20080820', | |
| 2160 'Modality': 'MR' | |
| 2161 }}) | |
| 2162 self.assertEqual(2, len(a)) | |
| 2163 | |
| 2164 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 2165 'CaseSensitive' : True, | |
| 2166 'Query' : { | |
| 2167 'StudyDate' : '20080818-', | |
| 2168 'ModalitiesInStudy': 'MR' | |
| 2169 }}) | |
| 2170 self.assertEqual(1, len(a)) | |
| 2171 | |
| 2172 | |
| 14 | 2173 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
| 2174 'CaseSensitive' : False, | |
|
194
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2175 'Query' : { 'PatientName' : 'BRAINIX' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2176 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2177 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2178 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2179 'CaseSensitive' : False, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2180 'Query' : { 'PatientName' : 'BRAINIX\\KNEE\\NOPE' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2181 self.assertEqual(2, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2182 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2183 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2184 'CaseSensitive' : False, |
| 14 | 2185 'Query' : { 'PatientName' : '*n*' }}) |
| 2186 self.assertEqual(2, len(a)) | |
| 2187 | |
| 2188 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 2189 'CaseSensitive' : True, | |
| 2190 'Query' : { 'PatientName' : '*n*' }}) | |
| 2191 self.assertEqual(0, len(a)) | |
| 2192 | |
| 2193 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True, | |
| 2194 'Level' : 'Patient', | |
| 2195 'CaseSensitive' : False, | |
| 2196 'Query' : { 'PatientName' : '*ne*' }}) | |
| 2197 self.assertEqual(1, len(a)) | |
| 2198 self.assertEqual('20080822', a[0]['MainDicomTags']['PatientBirthDate']) | |
| 2199 | |
| 2200 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 2201 'CaseSensitive' : True, | |
| 2202 'Query' : { 'PatientName' : '*ne*' }}) | |
| 2203 self.assertEqual(0, len(a)) | |
| 2204 | |
| 2205 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 2206 'CaseSensitive' : True, | |
| 2207 'Query' : { 'PatientName' : '*NE*' }}) | |
| 2208 self.assertEqual(1, len(a)) | |
| 2209 | |
| 2210 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 2211 'CaseSensitive' : True, | |
| 2212 'Query' : { 'PatientName' : '*NE*' }}) | |
| 2213 self.assertEqual(2, len(a)) | |
| 2214 | |
| 2215 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', | |
| 2216 'CaseSensitive' : True, | |
| 2217 'Query' : { 'PatientName' : '*NE*' }}) | |
| 548 | 2218 self.assertEqual(6, len(a)) |
| 14 | 2219 |
| 2220 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', 'Query' : { }}) | |
| 2221 self.assertEqual(2, len(a)) | |
| 2222 | |
| 2223 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', 'Query' : { }}) | |
| 2224 self.assertEqual(2, len(a)) | |
| 2225 | |
| 2226 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', 'Query' : { }}) | |
| 2227 self.assertEqual(4, len(a)) | |
| 2228 | |
| 2229 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', 'Query' : { }}) | |
| 548 | 2230 self.assertEqual(12, len(a)) |
| 14 | 2231 |
|
194
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2232 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2233 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2234 'Query' : { 'StudyDate' : '20061201-20061201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2235 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2236 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2237 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2238 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2239 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2240 'Query' : { 'StudyDate' : '20061201-20091201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2241 self.assertEqual(2, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2242 for i in range(2): |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2243 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2244 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2245 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2246 'Query' : { 'StudyDate' : '20061202-20061202' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2247 self.assertEqual(0, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2248 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2249 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2250 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2251 'Query' : { 'StudyDate' : '-20061201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2252 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2253 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2254 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2255 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2256 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2257 'Query' : { 'StudyDate' : '-20051201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2258 self.assertEqual(0, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2259 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2260 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2261 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2262 'Query' : { 'StudyDate' : '20061201-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2263 self.assertEqual(2, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2264 for i in range(2): |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2265 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2266 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2267 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2268 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2269 'Query' : { 'StudyDate' : '20061202-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2270 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2271 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2272 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2273 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2274 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2275 'Query' : { 'StudyDate' : '20080819-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2276 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2277 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2278 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2279 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2280 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2281 'Query' : { 'StudyDate' : '20080820-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2282 self.assertEqual(0, len(a)) |
|
666
acd22dd27e30
extended test_rest_find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
2283 |
|
acd22dd27e30
extended test_rest_find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
2284 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
acd22dd27e30
extended test_rest_find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
2285 'Expand' : True, |
|
acd22dd27e30
extended test_rest_find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
2286 'Query' : { 'PatientPosition' : 'HFS' }}) |
|
acd22dd27e30
extended test_rest_find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
2287 self.assertEqual(2, len(a)) |
|
acd22dd27e30
extended test_rest_find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
2288 |
|
acd22dd27e30
extended test_rest_find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
2289 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
acd22dd27e30
extended test_rest_find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
2290 'Expand' : False, |
|
acd22dd27e30
extended test_rest_find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
2291 'Query' : { 'PatientPosition' : 'HFS' }}) |
|
acd22dd27e30
extended test_rest_find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
2292 self.assertEqual(2, len(a)) |
|
194
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
2293 |
| 14 | 2294 |
| 2295 def test_rest_query_retrieve(self): | |
| 2296 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 2297 | |
| 2298 # Upload 8 instances | |
| 2299 for i in range(2): | |
| 2300 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 2301 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 2302 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 2303 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 2304 | |
| 2305 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 2306 for p in DoGet(_REMOTE, '/patients'): | |
| 2307 DoPost(_REMOTE, '/modalities/orthanctest/store', p) | |
| 2308 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 2309 | |
| 2310 for q in DoGet(_REMOTE, '/queries'): | |
| 2311 DoDelete(_REMOTE, '/queries/%s' % q) | |
| 2312 | |
| 2313 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 2314 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
|
2315 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2316 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
|
2317 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
|
2318 '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
|
2319 '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
|
2320 '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
|
2321 }})['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
|
2322 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
|
2323 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2324 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
|
2325 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
|
2326 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
|
2327 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
|
2328 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
|
2329 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
|
2330 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
|
2331 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
|
2332 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2333 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
|
2334 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
|
2335 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
|
2336 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
|
2337 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
|
2338 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
|
2339 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2340 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
|
2341 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2342 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
|
2343 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
|
2344 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
|
2345 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2346 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
|
2347 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
|
2348 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
|
2349 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2350 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
|
2351 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
|
2352 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
|
2353 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
|
2354 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
|
2355 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
|
2356 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2357 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
|
2358 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
|
2359 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
|
2360 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
|
2361 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
|
2362 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2363 # 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
|
2364 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
|
2365 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
|
2366 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
|
2367 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
|
2368 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
|
2369 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
|
2370 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
2371 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
|
2372 self.assertEqual(0, len(DoGet(_REMOTE, '/queries'))) |
| 14 | 2373 |
| 2374 | |
| 2375 def test_parent(self): | |
| 2376 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 2377 patient = '6816cb19-844d5aee-85245eba-28e841e6-2414fae2' | |
| 2378 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' | |
| 2379 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 2380 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d' | |
|
107
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
2381 self.assertEqual(instance, u) |
| 14 | 2382 |
| 2383 a = DoGet(_REMOTE, '/studies/%s/patient' % study) | |
| 2384 self.assertEqual('Patient', a['Type']) | |
| 2385 self.assertEqual(patient, a['ID']) | |
| 2386 | |
| 2387 a = DoGet(_REMOTE, '/series/%s/patient' % series) | |
| 2388 self.assertEqual('Patient', a['Type']) | |
| 2389 self.assertEqual(patient, a['ID']) | |
| 2390 | |
| 2391 a = DoGet(_REMOTE, '/series/%s/study' % series) | |
| 2392 self.assertEqual('Study', a['Type']) | |
| 2393 self.assertEqual(study, a['ID']) | |
| 2394 | |
| 2395 a = DoGet(_REMOTE, '/instances/%s/patient' % instance) | |
| 2396 self.assertEqual('Patient', a['Type']) | |
| 2397 self.assertEqual(patient, a['ID']) | |
| 2398 | |
| 2399 a = DoGet(_REMOTE, '/instances/%s/study' % instance) | |
| 2400 self.assertEqual('Study', a['Type']) | |
| 2401 self.assertEqual(study, a['ID']) | |
| 2402 | |
| 2403 a = DoGet(_REMOTE, '/instances/%s/series' % instance) | |
| 2404 self.assertEqual('Series', a['Type']) | |
| 2405 self.assertEqual(series, a['ID']) | |
| 2406 | |
| 2407 | |
| 2408 def test_shanon(self): | |
| 2409 def Anonymize(instance, replacements = {}): | |
| 119 | 2410 return DoPost(_REMOTE, '/instances/%s/anonymize' % instance, { |
| 2411 'Replace' : replacements, | |
| 2412 'Force' : True, | |
| 2413 }, 'application/json') | |
| 14 | 2414 |
| 2415 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 2416 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 2417 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 2418 | |
| 2419 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ] | |
| 2420 ids = [ 'ozp00SjY2xG', | |
| 2421 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 2422 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 2423 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ] | |
| 2424 | |
| 2425 a = ExtractDicomTags(Anonymize(u), tags) | |
| 2426 for i in range(4): | |
| 2427 self.assertNotEqual(ids[i], a[i]) | |
| 2428 self.assertTrue(a[4].startswith('Orthanc')) | |
| 2429 | |
| 2430 a = ExtractDicomTags(Anonymize(u, { 'PatientName' : 'toto' }), tags) | |
| 2431 for i in range(4): | |
| 2432 self.assertNotEqual(ids[i], a[i]) | |
| 2433 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2434 | |
| 2435 a = ExtractDicomTags(Anonymize(u, { 'SOPInstanceUID' : 'instance' }), tags) | |
| 2436 self.assertEqual('instance', a[3]) | |
| 2437 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2438 | |
| 2439 a = ExtractDicomTags(Anonymize(u, { 'SeriesInstanceUID' : 'series' }), tags) | |
| 2440 self.assertEqual('series', a[2]) | |
| 2441 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2442 | |
| 2443 a = ExtractDicomTags(Anonymize(u, { 'StudyInstanceUID' : 'study' }), tags) | |
| 2444 self.assertEqual('study', a[1]) | |
| 2445 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2446 | |
| 2447 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient' }), tags) | |
| 2448 self.assertEqual('patient', a[0]) | |
| 2449 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2450 | |
| 2451 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient', | |
| 2452 'StudyInstanceUID' : 'study', | |
| 2453 'SeriesInstanceUID' : 'series', | |
| 2454 'SOPInstanceUID' : 'instance' }), tags) | |
| 2455 self.assertEqual('patient', a[0]) | |
| 2456 self.assertFalse(a[4].startswith('Orthanc')) | |
| 2457 | |
| 2458 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 2459 | |
| 2460 | |
| 2461 def test_shanon_2(self): | |
| 2462 def Modify(instance, replacements = {}): | |
| 119 | 2463 return DoPost(_REMOTE, '/instances/%s/modify' % instance, { |
| 2464 'Replace' : replacements, | |
| 2465 'Force': True, | |
| 2466 }, 'application/json') | |
| 14 | 2467 |
| 2468 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 2469 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 2470 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 2471 | |
| 2472 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ] | |
| 2473 ids = [ 'ozp00SjY2xG', | |
| 2474 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 2475 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 2476 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ] | |
| 2477 | |
| 2478 a = ExtractDicomTags(Modify(u), tags) | |
| 2479 self.assertEqual(ids[0], a[0]) | |
| 2480 self.assertEqual(ids[1], a[1]) | |
| 2481 self.assertEqual(ids[2], a[2]) | |
| 2482 self.assertNotEqual(ids[3], a[3]) | |
| 2483 self.assertEqual(0, len(a[4])) | |
| 2484 | |
| 2485 a = ExtractDicomTags(Modify(u, { 'SOPInstanceUID' : 'instance' }), tags) | |
| 2486 self.assertEqual(ids[0], a[0]) | |
| 2487 self.assertEqual(ids[1], a[1]) | |
| 2488 self.assertEqual(ids[2], a[2]) | |
| 2489 self.assertEqual('instance', a[3]) | |
| 2490 | |
| 2491 a = ExtractDicomTags(Modify(u, { 'SeriesInstanceUID' : 'series' }), tags) | |
| 2492 self.assertEqual(ids[0], a[0]) | |
| 2493 self.assertEqual(ids[1], a[1]) | |
| 2494 self.assertEqual('series', a[2]) | |
| 2495 self.assertNotEqual(ids[3], a[3]) | |
| 2496 | |
| 2497 a = ExtractDicomTags(Modify(u, { 'StudyInstanceUID' : 'study' }), tags) | |
| 2498 self.assertEqual(ids[0], a[0]) | |
| 2499 self.assertEqual('study', a[1]) | |
| 2500 self.assertNotEqual(ids[2], a[2]) | |
| 2501 self.assertNotEqual(ids[3], a[3]) | |
| 2502 | |
| 2503 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient' }), tags) | |
| 2504 self.assertEqual('patient', a[0]) | |
| 2505 self.assertNotEqual(ids[1], a[1]) | |
| 2506 self.assertNotEqual(ids[2], a[2]) | |
| 2507 self.assertNotEqual(ids[3], a[3]) | |
| 2508 | |
| 2509 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient', | |
| 2510 'StudyInstanceUID' : 'study', | |
| 2511 'SeriesInstanceUID' : 'series', | |
| 2512 'SOPInstanceUID' : 'instance' }), tags) | |
| 2513 self.assertEqual('patient', a[0]) | |
| 2514 self.assertEqual('study', a[1]) | |
| 2515 self.assertEqual('series', a[2]) | |
| 2516 self.assertEqual('instance', a[3]) | |
| 2517 | |
| 2518 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 2519 | |
| 2520 | |
| 2521 def test_instances_tags(self): | |
| 2522 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 2523 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')['ID'] | |
| 2524 #a = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386937.676343')['ID'] | |
| 2525 #b = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386925.676329')['ID'] | |
| 2526 | |
| 2527 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/patients')[0]) | |
| 2528 self.assertEqual(2, len(i)) | |
| 2529 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 2530 self.assertEqual('887', i[i.keys()[1]]['PatientID']) | |
| 2531 | |
| 2532 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/studies')[0]) | |
| 2533 self.assertEqual(2, len(i)) | |
| 2534 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 2535 self.assertEqual('887', i[i.keys()[1]]['PatientID']) | |
| 2536 | |
| 2537 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 2538 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[0]) | |
| 2539 self.assertEqual(1, len(i)) | |
| 2540 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 2541 | |
| 2542 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[1]) | |
| 2543 self.assertEqual(1, len(i)) | |
| 2544 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 2545 | |
|
136
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2546 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
|
2547 self.assertEqual(1, len(i)) |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2548 self.assertEqual('887', i[i.keys()[0]]['0010,0020']) |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2549 |
| 14 | 2550 |
| 2551 def test_lookup(self): | |
| 2552 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG') | |
| 2553 self.assertEqual(0, len(a)) | |
| 2554 | |
| 2555 UploadInstance(_REMOTE, 'DummyCT.dcm') | |
| 2556 | |
| 2557 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG') | |
| 2558 self.assertEqual(1, len(a)) | |
| 2559 self.assertEqual('Patient', a[0]['Type']) | |
| 2560 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', a[0]['ID']) | |
| 2561 self.assertEqual('/patients/%s' % a[0]['ID'], a[0]['Path']) | |
| 2562 | |
| 2563 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390') | |
| 2564 self.assertEqual(1, len(a)) | |
| 2565 self.assertEqual('Study', a[0]['Type']) | |
| 2566 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', a[0]['ID']) | |
| 2567 self.assertEqual('/studies/%s' % a[0]['ID'], a[0]['Path']) | |
| 2568 | |
| 2569 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394') | |
| 2570 self.assertEqual(1, len(a)) | |
| 2571 self.assertEqual('Series', a[0]['Type']) | |
| 2572 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', a[0]['ID']) | |
| 2573 self.assertEqual('/series/%s' % a[0]['ID'], a[0]['Path']) | |
| 2574 | |
| 2575 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109') | |
| 2576 self.assertEqual(1, len(a)) | |
| 2577 self.assertEqual('Instance', a[0]['Type']) | |
| 2578 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a[0]['ID']) | |
| 2579 self.assertEqual('/instances/%s' % a[0]['ID'], a[0]['Path']) | |
| 2580 | |
| 2581 DropOrthanc(_REMOTE) | |
| 2582 a = DoPost(_REMOTE, '/tools/lookup', '3113719P') | |
| 2583 self.assertEqual(0, len(a)) | |
| 2584 | |
| 15 | 2585 |
| 2586 def test_autorouting(self): | |
| 2587 knee1 = 'Knee/T1/IM-0001-0001.dcm' | |
| 2588 knee2 = 'Knee/T2/IM-0001-0002.dcm' | |
| 2589 other = 'Brainix/Flair/IM-0001-0001.dcm' | |
| 2590 | |
| 2591 # Check that this version is >= 0.8.0 | |
| 2592 self.assertTrue(IsDefinedInLua(_REMOTE, '_InitializeJob')) | |
| 2593 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities')) | |
| 2594 | |
| 2595 UploadInstance(_REMOTE, knee1) | |
| 2596 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 2597 | |
| 2598 DropOrthanc(_REMOTE) | |
| 2599 DropOrthanc(_LOCAL) | |
| 174 | 2600 InstallLuaScriptFromPath(_REMOTE, 'Lua/Autorouting.lua') |
| 15 | 2601 UploadInstance(_REMOTE, knee1) |
| 2602 UploadInstance(_REMOTE, knee2) | |
| 2603 UploadInstance(_REMOTE, other) | |
| 2604 WaitEmpty(_REMOTE) | |
| 174 | 2605 UninstallLuaCallbacks(_REMOTE) |
| 15 | 2606 self.assertEqual(3, len(DoGet(_LOCAL, '/instances'))) |
| 2607 | |
| 2608 DropOrthanc(_REMOTE) | |
| 2609 DropOrthanc(_LOCAL) | |
| 174 | 2610 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingConditional.lua') |
| 15 | 2611 UploadInstance(_REMOTE, knee1) |
| 2612 UploadInstance(_REMOTE, knee2) | |
| 2613 UploadInstance(_REMOTE, other) | |
| 2614 WaitEmpty(_REMOTE) | |
| 174 | 2615 UninstallLuaCallbacks(_REMOTE) |
| 15 | 2616 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
| 2617 | |
| 2618 DropOrthanc(_REMOTE) | |
| 2619 DropOrthanc(_LOCAL) | |
| 174 | 2620 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingModification.lua') |
| 15 | 2621 UploadInstance(_REMOTE, knee1) |
| 2622 WaitEmpty(_REMOTE) | |
| 174 | 2623 UninstallLuaCallbacks(_REMOTE) |
| 15 | 2624 i = DoGet(_LOCAL, '/instances') |
| 2625 self.assertEqual(1, len(i)) | |
| 2626 | |
| 2627 with tempfile.NamedTemporaryFile(delete = True) as f: | |
| 2628 f.write(DoGet(_LOCAL, '/instances/%s/file' % i[0])) | |
| 2629 f.flush() | |
| 45 | 2630 routed = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ]) |
| 15 | 2631 self.assertEqual('My Medical Device', re.search('"StationName">(.*?)<', routed).group(1).strip()) |
| 2632 self.assertEqual(None, re.search('"MilitaryRank"', routed)) | |
| 2633 self.assertEqual(None, re.search('"0051,0010"', routed)) # A private tag | |
| 17 | 2634 |
| 2635 | |
| 2636 def test_storescu_rf(self): | |
| 2637 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] | |
| 2638 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 2639 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 2640 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 18 | 2641 |
| 2642 | |
| 2643 def test_anonymize_instance(self): | |
| 2644 def AnonymizeAndUpload(instanceId, parameters): | |
| 2645 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/anonymize' % instanceId, parameters, | |
| 2646 'application/json'), 'application/dicom')['ID'] | |
| 2647 | |
| 2648 def ModifyAndUpload(instanceId, parameters): | |
| 2649 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/modify' % instanceId, parameters, | |
| 2650 'application/json'), 'application/dicom')['ID'] | |
| 2651 | |
| 2652 a = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] | |
| 2653 s1 = DoGet(_REMOTE, '/instances/%s/content/PatientName' % a) | |
| 2654 s2 = DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % a) # Some private tag | |
| 2655 s3 = DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % a) | |
| 2656 s4 = DoGet(_REMOTE, '/instances/%s/content/SeriesDescription' % a) | |
| 2657 s5 = DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a) | |
| 2658 | |
| 2659 b = AnonymizeAndUpload(a, '{}') | |
| 2660 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2661 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2662 | |
| 2663 # Keep private tag (only OK since Orthanc 0.8.0) | |
| 2664 b = AnonymizeAndUpload(a, '{"Keep":["00e1-10c2"]}') | |
| 2665 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2666 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2667 | |
| 2668 b = AnonymizeAndUpload(a, '{"Keep":["00e1,10c2","PatientName"]}') | |
| 2669 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2670 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2671 | |
| 2672 b = AnonymizeAndUpload(a, '{"Keep":["PatientName"],"Replace":{"00e1,10c2":"Hello"}}') | |
| 2673 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2674 self.assertTrue(DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b).startswith('Hello')) | |
| 2675 | |
| 2676 # Examples from the Wiki | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
2677 b = AnonymizeAndUpload(a, '{"Replace":{"PatientName":"hello","0010-0020":"world"},"Keep":["StudyDescription", "SeriesDescription"],"KeepPrivateTags": true,"Force":true}') |
| 18 | 2678 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip()) |
| 2679 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip()) | |
| 2680 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b)) | |
| 2681 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b)) | |
| 2682 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b)) | |
| 2683 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2684 DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a) | |
| 2685 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 2686 | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
2687 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Remove":["InstitutionName"],"RemovePrivateTags": true,"Force":true}') |
| 18 | 2688 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip()) |
| 2689 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip()) | |
| 2690 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b)) | |
| 2691 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b)) | |
| 2692 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2693 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 2694 | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
2695 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Force":true}') |
| 18 | 2696 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip()) |
| 2697 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip()) | |
| 2698 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1,10c2' % b)) | |
| 2699 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b)) | |
| 2700 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b)) | |
| 2701 self.assertEqual(s5, DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 2702 | |
| 2703 | |
| 2704 # Test modify non-existing | |
| 2705 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2706 json.dumps({ | |
| 2707 'PatientName' : 'Jodogne', | |
| 2708 'Modality' : 'CT', | |
| 2709 }))['ID'] | |
| 2710 | |
| 2711 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i).strip()) | |
| 2712 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % i)) | |
| 2713 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i).strip()) | |
| 2714 | |
| 2715 b = ModifyAndUpload(i, '{"Replace":{"StudyDescription":"hello","Modality":"world"}}') | |
| 2716 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % b).strip()) | |
| 2717 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % b).strip()) | |
| 2718 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/Modality' % b).strip()) | |
| 2719 | |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2720 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2721 def test_incoming_jpeg(self): |
|
463
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
2722 # 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
|
2723 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
|
2724 |
|
468
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2725 def storescu(image, acceptUnknownSopClassUid, expectSuccess = True, retries = 1): |
|
61
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2726 if acceptUnknownSopClassUid: |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2727 tmp = [ '-xf', GetDatabasePath('UnknownSopClassUid.cfg'), 'Default' ] |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2728 else: |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2729 tmp = [ '-xs' ] |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2730 |
|
468
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2731 while retries > 0: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2732 retries -= 1 |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2733 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
|
2734 try: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2735 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
|
2736 [ _REMOTE['Server'], str(_REMOTE['DicomPort']), |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2737 GetDatabasePath(image) ], |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2738 stderr = FNULL) |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2739 |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2740 if expectSuccess: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2741 return |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2742 except subprocess.CalledProcessError as e: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2743 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
|
2744 if not expectSuccess: |
|
e1867aeb57e2
retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents:
465
diff
changeset
|
2745 raise e |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2746 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2747 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
|
2748 |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2749 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
|
2750 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
|
2751 '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
|
2752 ]) |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2753 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
|
2754 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
|
2755 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
|
2756 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
|
2757 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
|
2758 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
|
2759 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
|
2760 else: |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2761 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
|
2762 |
| 490 | 2763 # 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
|
2764 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
|
2765 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
|
2766 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
|
2767 |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2768 if IsOrthancVersionAbove(_REMOTE, 1, 9, 0): |
| 374 | 2769 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
|
2770 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
|
2771 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
|
2772 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
|
2773 else: |
|
f673153f27a4
use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
372
diff
changeset
|
2774 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
|
2775 |
|
62
f9c4ce95756f
removal of useless information
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
2776 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
|
2777 storescu('Knix/Loc/IM-0001-0001.dcm', False) |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2778 storescu('UnknownSopClassUid.dcm', True) |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2779 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2780 |
|
463
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
2781 # set back normal verbosity |
|
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
2782 DoPut(_REMOTE, '/tools/log-level', 'default') |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2783 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2784 def test_storescu_jpeg(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2785 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2786 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2787 knixStudy = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' |
| 64 | 2788 i = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm')['ID'] |
| 2789 | |
| 2790 # This is JPEG lossless | |
|
136
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2791 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header' % i)['0002,0010']['Value']) |
| 64 | 2792 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
|
2793 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header?short' % i)['0002,0010']) |
| 64 | 2794 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2795 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm') |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2796 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0003.dcm') |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2797 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2798 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
|
2799 b = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2800 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2801 DoPost(_REMOTE, '/modalities/orthanctest/store', [ knixStudy, a, b ]) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2802 self.assertEqual(5, len(DoGet(_LOCAL, '/instances'))) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2803 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2804 self.assertEqual(3, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2805 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2806 DropOrthanc(_REMOTE) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2807 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2808 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2809 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2810 def test_pixel_data(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2811 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
|
2812 color = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2813 phenix = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2814 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2815 phenixSize = 358 * 512 * 2 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2816 colorSize = 1000 * 1000 * 3 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2817 jpegSize = 51918 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2818 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2819 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
|
2820 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
|
2821 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
|
2822 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2823 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
|
2824 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
|
2825 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2826 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
|
2827 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
|
2828 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2829 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2830 def test_decode_brainix(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2831 brainix = [ |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2832 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'], # (*) |
| 384 | 2833 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
|
2834 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
|
2835 ] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2836 h = '6fb11b932d535c2be04beabd99793ff8' |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2837 maxValue = 426.0 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2838 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2839 truth = Image.open(GetDatabasePath('Formats/Brainix.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2840 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2841 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2842 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2843 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2844 truth2 = map(lambda x: min(255, x), truth.getdata()) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2845 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2846 self.AssertSameImages(truth2, '/instances/%s/image-uint8' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2847 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2848 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
|
2849 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2850 self.AssertSameImages(truth2, '/instances/%s/preview' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2851 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2852 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2853 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
|
2854 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2855 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2856 def test_decode_color(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2857 imagej = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2858 color = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2859 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2860 for i in [ imagej, color ]: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2861 for j in [ 'image-uint8', 'image-uint16', 'image-int16' ]: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2862 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
|
2863 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2864 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
|
2865 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
|
2866 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2867 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
|
2868 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
|
2869 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2870 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2871 def test_decode_rf(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2872 rf = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2873 truth = Image.open(GetDatabasePath('Formats/KarstenHilbertRF.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2874 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2875 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2876 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2877 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2878 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2879 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2880 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
|
2881 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2882 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2883 def test_decode_multiframe(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2884 mf = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2885 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2886 # Test the first frame |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2887 truth = Image.open(GetDatabasePath('Formats/Multiframe0.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2888 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2889 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2890 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2891 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2892 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
|
2893 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2894 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
|
2895 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2896 # Test the last frame |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2897 truth = Image.open(GetDatabasePath('Formats/Multiframe75.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2898 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
|
2899 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2900 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2901 def test_decode_signed(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2902 signed = UploadInstance(_REMOTE, 'SignedCT.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2903 minValue = -2000 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2904 maxValue = 4042 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2905 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2906 truth = Image.open(GetDatabasePath('Formats/SignedCT.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2907 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2908 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2909 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
|
2910 self.AssertSameImages(truth2, '/instances/%s/image-uint16' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2911 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2912 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
|
2913 self.AssertSameImages(truth3, '/instances/%s/image-uint8' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2914 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2915 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
|
2916 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
|
2917 self.AssertSameImages(tmp, '/instances/%s/preview' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2918 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2919 self.assertEqual('b57e6c872a3da50877c7da689b03a444', ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % signed))) |
| 22 | 2920 |
| 2921 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
2922 def test_googlecode_issue_32(self): |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2923 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/default-encoding', 'nope')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2924 self.assertEqual('Windows1251', DoPut(_REMOTE, '/tools/default-encoding', 'Windows1251')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2925 self.assertEqual('Windows1251', DoGet(_REMOTE, '/tools/default-encoding')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2926 |
| 22 | 2927 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID'] |
| 2928 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f) | |
| 2929 self.assertEqual(u'Рентгенография', tags['SeriesDescription']) | |
| 2930 self.assertEqual(u'Таз', tags['BodyPartExamined']) | |
| 2931 self.assertEqual(u'Прямая', tags['ViewPosition']) | |
| 2932 | |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2933 # 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
|
2934 self.assertEqual('Latin1', DoPut(_REMOTE, '/tools/default-encoding', 'Latin1')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2935 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2936 DoDelete(_REMOTE, '/instances/%s' % f) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2937 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID'] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2938 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2939 self.assertNotEqual(u'Рентгенография', tags['SeriesDescription']) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2940 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2941 |
| 22 | 2942 def test_encodings(self): |
| 23 | 2943 # Latin-1 (ISO_IR 100) |
| 22 | 2944 brainix = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
| 2945 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % brainix) | |
| 2946 self.assertEqual(u'IRM cérébrale, neuro-crâne', tags['StudyDescription']) | |
| 23 | 2947 |
| 2948 # Latin-2 (ISO_IR 101) | |
| 2949 a = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID'] | |
| 2950 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % a) | |
| 2951 # dcm2xml MarekLatin2.dcm | iconv -f latin2 -t utf-8 | xmllint --format - | |
| 2952 self.assertEqual('Imię i Nazwisko osoby opisującej', | |
| 2953 i['ContentSequence'][4]['ConceptNameCodeSequence'][0]['CodeMeaning'].encode('utf-8')) | |
| 2954 | |
|
26
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2955 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2956 def test_storescu_custom_aet(self): |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2957 # 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
|
2958 # 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
|
2959 # in the REST API)." |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2960 # 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
|
2961 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2962 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2963 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2964 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2965 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2966 c = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0003.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2967 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2968 j = DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2969 'LocalAet' : 'YOP', |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2970 'Resources' : [ a['ID'], b['ID'] ] |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2971 }) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2972 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2973 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2974 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
|
2975 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2976 DropOrthanc(_LOCAL) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2977 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2978 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2979 j = DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2980 'Resources' : [ c['ID'] ] |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2981 }) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2982 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2983 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2984 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
|
2985 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2986 DropOrthanc(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2987 DropOrthanc(_LOCAL) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2988 |
| 174 | 2989 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingChangeAet.lua') |
|
26
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2990 DoPost(_REMOTE, '/tools/execute-script', 'aet = "HELLO"', 'application/lua') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2991 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2992 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2993 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2994 WaitEmpty(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2995 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2996 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
|
2997 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2998 DoPost(_REMOTE, '/tools/execute-script', 'aet = nill', 'application/lua') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2999 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
3000 WaitEmpty(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
3001 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
3002 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
|
3003 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
3004 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
|
3005 # 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
|
3006 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
|
3007 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
|
3008 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
|
3009 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
|
3010 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
|
3011 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
3012 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
|
3013 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
|
3014 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
|
3015 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
|
3016 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
3017 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
|
3018 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
|
3019 |
|
732
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
3020 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5): # with ExtendedFind, the limit=0 means no-limit like in /tools/find |
|
688
b58f639aee60
added tests for limit=0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
687
diff
changeset
|
3021 self.assertEqual(2, len(DoGet(_REMOTE, '/patients?since=0&limit=0'))) |
|
b58f639aee60
added tests for limit=0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
687
diff
changeset
|
3022 self.assertEqual(1, len(DoGet(_REMOTE, '/patients?since=1&limit=0'))) |
|
b58f639aee60
added tests for limit=0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
687
diff
changeset
|
3023 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=2&limit=0'))) |
|
b58f639aee60
added tests for limit=0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
687
diff
changeset
|
3024 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=3&limit=0'))) |
|
b58f639aee60
added tests for limit=0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
687
diff
changeset
|
3025 else: |
| 675 | 3026 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=0&limit=0'))) |
|
688
b58f639aee60
added tests for limit=0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
687
diff
changeset
|
3027 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=1&limit=0'))) |
|
b58f639aee60
added tests for limit=0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
687
diff
changeset
|
3028 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=2&limit=0'))) |
|
b58f639aee60
added tests for limit=0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
687
diff
changeset
|
3029 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=3&limit=0'))) |
|
34
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
3030 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
|
3031 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
|
3032 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
|
3033 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
|
3034 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
|
3035 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
|
3036 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
|
3037 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
|
3038 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
|
3039 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
|
3040 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
|
3041 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
|
3042 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
|
3043 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
|
3044 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
3045 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
|
3046 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
|
3047 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
|
3048 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
|
3049 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
|
3050 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
|
3051 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
|
3052 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
3053 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
|
3054 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
|
3055 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
|
3056 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
3057 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
|
3058 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
|
3059 self.assertTrue(instance in s) |
| 36 | 3060 |
| 3061 | |
| 3062 def test_create_pdf(self): | |
| 3063 # Upload 4 instances | |
| 3064 brainixInstance = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] | |
| 3065 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 3066 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 3067 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 3068 | |
| 3069 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0' | |
| 3070 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' | |
| 3071 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8' | |
| 3072 | |
| 3073 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f: | |
| 3074 pdf = f.read() | |
| 3075 | |
| 3076 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 3077 json.dumps({ | |
| 3078 'Tags' : { | |
| 3079 'PatientName' : 'Jodogne', | |
| 3080 'Modality' : 'CT', | |
| 3081 }, | |
| 3082 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 3083 })) | |
| 3084 | |
| 3085 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
|
565
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
3086 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.1', DoGet(_REMOTE, '/instances/%s/content/SOPClassUID' % i['ID']).strip('\x00')) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
3087 self.assertEqual('WSD', DoGet(_REMOTE, '/instances/%s/content/ConversionType' % i['ID']).strip()) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
3088 self.assertEqual('application/pdf', DoGet(_REMOTE, '/instances/%s/content/MIMETypeOfEncapsulatedDocument' % i['ID']).strip()) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
3089 |
|
446
9184e6cb215a
allow custom value for "Modality" in /tools/create-dicom for PDF
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
445
diff
changeset
|
3090 # 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
|
3091 # 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
|
3092 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip()) |
| 36 | 3093 |
| 3094 b = DoGet(_REMOTE, '/instances/%s/content/0042-0011' % i['ID']) | |
| 3095 self.assertEqual(len(b), len(pdf) + 1) | |
| 3096 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf + '\0')) | |
| 3097 | |
| 3098 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/tools/create-dicom', | |
| 3099 json.dumps({ | |
| 3100 'Parent' : brainixPatient, | |
| 3101 'Tags' : { | |
| 3102 'PatientName' : 'Jodogne', | |
| 3103 } | |
| 3104 }))) | |
| 3105 | |
| 3106 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 3107 json.dumps({ | |
| 3108 'Parent' : brainixPatient, | |
| 3109 'Tags' : { 'StudyDescription' : 'PDF^Patient' }, | |
| 3110 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 3111 })) | |
| 3112 | |
| 3113 self.assertEqual(brainixPatient, DoGet(_REMOTE, '/instances/%s/patient' % i['ID'])['ID']) | |
|
565
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
3114 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.1', DoGet(_REMOTE, '/instances/%s/content/SOPClassUID' % i['ID']).strip('\x00')) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
3115 self.assertEqual('OT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip('\x00')) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
3116 self.assertEqual('WSD', DoGet(_REMOTE, '/instances/%s/content/ConversionType' % i['ID']).strip()) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
3117 self.assertEqual('application/pdf', DoGet(_REMOTE, '/instances/%s/content/MIMETypeOfEncapsulatedDocument' % i['ID']).strip()) |
| 36 | 3118 |
| 3119 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 3120 json.dumps({ | |
| 3121 'Parent' : brainixStudy, | |
| 3122 'Tags' : { 'SeriesDescription' : 'PDF^Study' }, | |
| 3123 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 3124 })) | |
| 3125 | |
| 3126 self.assertEqual(brainixStudy, DoGet(_REMOTE, '/instances/%s/study' % i['ID'])['ID']) | |
| 3127 | |
| 3128 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 3129 json.dumps({ | |
| 3130 'Parent' : brainixEpi, | |
| 37 | 3131 'Tags' : { 'SpecificCharacterSet' : 'ISO_IR 13' }, |
| 36 | 3132 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) |
| 3133 })) | |
| 3134 | |
| 3135 self.assertEqual(brainixEpi, DoGet(_REMOTE, '/instances/%s/series' % i['ID'])['ID']) | |
| 3136 | |
| 3137 b = DoGet(_REMOTE, '/instances/%s/pdf' % i['ID']) | |
| 3138 self.assertEqual(len(b), len(pdf)) | |
| 3139 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf)) | |
| 3140 | |
| 3141 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/pdf' % brainixInstance)) | |
| 38 | 3142 |
| 3143 | |
| 3144 def test_create_series(self): | |
| 3145 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 3146 json.dumps({ | |
| 3147 'Tags' : { | |
| 40 | 3148 'SpecificCharacterSet' : 'ISO_IR 100', |
| 3149 'PatientName' : 'Sébastien Jodogne', | |
| 38 | 3150 'Modality' : 'CT', |
| 3151 }, | |
| 3152 'Content' : [ | |
| 40 | 3153 { |
| 3154 'Content': 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==', # red dot in RGBA | |
| 3155 'Tags' : { 'ImageComments' : 'Tutu' } | |
| 3156 }, | |
| 38 | 3157 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAoUlEQVQ4jZ2SWw3EIBREjwUsYAELa2EtoAULFUCyXAtroRZqoRbox254BdLC/DZnZjoXWJFgCDg8egW2CBEhEnDzyRk+Ecxz2KP/0AL8S99T+jQccAVs22qKwAuPuq0uyNg9cPLh3am+pe/dkHLZtqJHj6vXJrZ7nvzvxxgemXgUwnGfXqpee09mUwp8m022OYP6bLF7mVuVe0y/umxinsAXRd9z0k1ubWsAAAAASUVORK5CYII=', |
| 3158 ] | |
| 3159 })) | |
| 3160 | |
| 3161 s = DoGet(_REMOTE, i['Path']) | |
| 3162 self.assertEqual('Series', s['Type']) | |
| 3163 self.assertEqual(s['ID'], i['ID']) | |
| 3164 self.assertEqual(2, len(s['Instances'])) | |
| 39 | 3165 self.assertEqual(2, s['ExpectedNumberOfInstances']) |
| 3166 self.assertEqual('Complete', s['Status']) | |
| 40 | 3167 |
| 3168 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][0]) | |
| 3169 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][1]) | |
| 3170 self.assertTrue('ImageComments' in a or 'ImageComments' in b) | |
| 3171 if 'ImageComments' in a: | |
| 3172 self.assertEqual('Tutu', a['ImageComments']) | |
| 3173 else: | |
| 3174 self.assertEqual('Tutu', b['ImageComments']) | |
| 3175 | |
| 3176 patient = DoGet(_REMOTE, '/instances/%s/patient' % s['Instances'][0]) | |
| 3177 self.assertEqual(patient['MainDicomTags']['PatientName'].encode('utf-8'), | |
| 3178 'Sébastien Jodogne') | |
| 47 | 3179 |
| 3180 | |
| 3181 def test_create_binary(self): | |
| 3182 binary = ''.join(map(chr, range(256))) | |
| 3183 encoded = 'data:application/octet-stream;base64,' + base64.b64encode(binary) | |
| 3184 tags = { | |
| 3185 'PatientName' : 'Jodogne', | |
| 3186 '8899-8899' : encoded | |
| 3187 } | |
| 3188 | |
| 3189 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 3190 json.dumps({ | |
| 266 | 3191 'Tags' : tags, |
| 3192 'PrivateCreator' : 'TestBinary', | |
| 47 | 3193 })) |
| 3194 | |
| 3195 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 3196 self.assertEqual(binary, DoGet(_REMOTE, '/instances/%s/content/8899-8899' % i['ID']).strip()) | |
| 3197 | |
| 3198 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 3199 json.dumps({ | |
| 3200 'InterpretBinaryTags' : False, | |
| 266 | 3201 'Tags' : tags, |
| 3202 'PrivateCreator' : 'TestBinary', | |
| 47 | 3203 })) |
| 3204 | |
| 3205 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 3206 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
|
3207 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3208 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3209 def test_patient_ids_collision(self): |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3210 # 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
|
3211 # same PatientID |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3212 for i in range(3): |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3213 UploadInstance(_REMOTE, 'PatientIdsCollision/Image%d.dcm' % (i + 1)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3214 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3215 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3216 'Query' : { 'PatientName' : '*' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3217 self.assertEqual(1, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3218 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
|
3219 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3220 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3221 'CaseSensitive' : True, |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3222 'Query' : { 'PatientName' : 'FOO\\HELLO' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3223 self.assertEqual(2, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3224 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3225 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3226 'CaseSensitive' : False, |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3227 'Query' : { 'PatientName' : 'Foo' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3228 self.assertEqual(1, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3229 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
|
3230 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
|
3231 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
|
3232 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3233 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3234 'Query' : { 'PatientName' : '*' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3235 self.assertEqual(3, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3236 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
|
3237 self.assertTrue('FOO^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3238 self.assertTrue('HELLO^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3239 self.assertTrue('WORLD^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3240 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3241 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
|
3242 self.assertEqual(1, len(set(d))) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3243 self.assertEqual('COMMON', d[0]) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3244 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3245 for i in a: |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3246 d = DoGet(_REMOTE, '/studies/%s' % i) ['MainDicomTags']['StudyDescription'] |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3247 p = DoGet(_REMOTE, '/studies/%s' % i) ['PatientMainDicomTags']['PatientName'] |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
3248 self.assertEqual('%s^SERIES' % p, d) |
|
49
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3249 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3250 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3251 def test_bitbucket_issue_4(self): |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3252 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3253 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3254 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3255 UploadInstance(_REMOTE, 'Formats/Jpeg.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3256 UploadInstance(_REMOTE, 'Formats/JpegLossless.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3257 UploadInstance(_REMOTE, 'Formats/Rle.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3258 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3259 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3260 self.assertEqual(6, len(DoGet(_REMOTE, '/instances'))) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3261 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3262 p = DoGet(_REMOTE, '/patients') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3263 self.assertEqual(2, len(p)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3264 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
|
3265 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
|
3266 self.assertEqual(3, len(i1)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3267 self.assertEqual(3, len(i2)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3268 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3269 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
|
3270 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
3271 self.assertEqual(6, len(DoGet(_LOCAL, '/instances'))) |
|
50
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3272 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3273 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3274 def test_create_sequence(self): |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3275 i = DoPost(_REMOTE, '/tools/create-dicom', |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3276 json.dumps({ |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3277 'Tags' : { |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3278 'SpecificCharacterSet': 'ISO_IR 100', # Encode using Latin1 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3279 'PatientName': 'Jodogne^', |
|
51
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3280 'ReferencedStudySequence': GenerateTestSequence(), |
|
50
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3281 } |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3282 }))['ID'] |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3283 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3284 self.assertEqual('Jodogne^', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i)) |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3285 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
|
3286 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
|
3287 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
|
3288 self.assertEqual(u'Sébastien^'.encode('latin-1'), |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
3289 DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence/1/StudyDescription' % i)) |
|
51
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3290 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3291 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3292 def test_modify_sequence(self): |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3293 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3294 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
|
3295 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3296 j = DoPost(_REMOTE, '/instances/%s/modify' % i, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3297 json.dumps({ |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3298 "Replace" : { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3299 "PatientName" : "hello", |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3300 'ReferencedStudySequence': GenerateTestSequence(), |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3301 }, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3302 }), |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3303 'application/json') |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3304 j = DoPost(_REMOTE, '/instances', j, 'application/dicom')['ID'] |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3305 DoDelete(_REMOTE, '/instances/%s' % i) |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
3306 |
| 52 | 3307 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence' % j))) |
| 3308 | |
| 3309 | |
| 3310 def test_compression(self): | |
| 3311 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 3312 | |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3313 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
|
3314 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
|
3315 # 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
|
3316 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
|
3317 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
|
3318 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3319 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
|
3320 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
|
3321 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
|
3322 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3323 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
|
3324 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3325 # 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
|
3326 # 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
|
3327 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
|
3328 DoPost(_REMOTE, '/instances/%s/attachments/dicom/uncompress' % i) |
| 52 | 3329 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3330 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
|
3331 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
|
3332 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
|
3333 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
|
3334 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
|
3335 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
|
3336 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
|
3337 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3338 ops = DoGet(_REMOTE, '/instances/%s/attachments/dicom' % i) |
| 52 | 3339 self.assertTrue('compress' in ops) |
| 3340 self.assertTrue('uncompress' in ops) | |
| 3341 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
|
3342 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
|
3343 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
|
3344 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3345 # Re-compress the attachment |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3346 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
|
3347 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
|
3348 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
|
3349 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
|
3350 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
|
3351 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
|
3352 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
|
3353 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
|
3354 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
|
3355 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
|
3356 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3357 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
|
3358 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
|
3359 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
|
3360 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
|
3361 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
|
3362 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
|
3363 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
|
3364 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
|
3365 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
|
3366 self.assertEqual(us, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])) |
| 53 | 3367 |
| 3368 | |
| 3369 def test_ordered_slices(self): | |
| 3370 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] | |
| 3371 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 3372 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 3373 self.assertEqual('Sequence', o['Type']) | |
| 3374 self.assertEqual(1, len(o['Dicom'])) | |
| 3375 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/file', o['Dicom'][0]) | |
| 3376 self.assertEqual(76, len(o['Slices'])) | |
| 3377 for j in range(76): | |
| 3378 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/frames/%d' % j, o['Slices'][j]) | |
| 3379 | |
| 68 | 3380 self.assertEqual(1, len(o['SlicesShort'])) |
| 3381 self.assertEqual('9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02', o['SlicesShort'][0][0]) | |
| 3382 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 3383 self.assertEqual(76, o['SlicesShort'][0][2]) | |
| 3384 | |
| 53 | 3385 i = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
| 3386 j = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')['ID'] | |
| 3387 k = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')['ID'] | |
| 3388 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 3389 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 3390 | |
| 3391 self.assertEqual('Volume', o['Type']) | |
| 3392 self.assertEqual(3, len(o['Dicom'])) | |
| 3393 self.assertEqual(3, len(o['Slices'])) | |
| 3394 self.assertEqual('/instances/%s/file' % i, o['Dicom'][2]) | |
| 3395 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1]) | |
| 3396 self.assertEqual('/instances/%s/file' % k, o['Dicom'][0]) | |
| 3397 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][2]) | |
| 3398 self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1]) | |
| 3399 self.assertEqual('/instances/%s/frames/0' % k, o['Slices'][0]) | |
| 3400 | |
| 68 | 3401 self.assertEqual(3, len(o['SlicesShort'])) |
| 3402 self.assertEqual(k, o['SlicesShort'][0][0]) | |
| 3403 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 3404 self.assertEqual(1, o['SlicesShort'][0][2]) | |
| 3405 self.assertEqual(j, o['SlicesShort'][1][0]) | |
| 3406 self.assertEqual(0, o['SlicesShort'][1][1]) | |
| 3407 self.assertEqual(1, o['SlicesShort'][1][2]) | |
| 3408 self.assertEqual(i, o['SlicesShort'][2][0]) | |
| 3409 self.assertEqual(0, o['SlicesShort'][2][1]) | |
| 3410 self.assertEqual(1, o['SlicesShort'][2][2]) | |
| 3411 | |
| 53 | 3412 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID'] |
| 3413 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm')['ID'] | |
| 3414 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 3415 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 3416 | |
| 3417 self.assertEqual('Sequence', o['Type']) | |
| 3418 self.assertEqual(2, len(o['Dicom'])) | |
| 3419 self.assertEqual(2, len(o['Slices'])) | |
| 3420 self.assertEqual('/instances/%s/file' % i, o['Dicom'][0]) | |
| 3421 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1]) | |
| 3422 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][0]) | |
| 3423 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
|
3424 |
| 68 | 3425 self.assertEqual(2, len(o['SlicesShort'])) |
| 3426 self.assertEqual(i, o['SlicesShort'][0][0]) | |
| 3427 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 3428 self.assertEqual(1, o['SlicesShort'][0][2]) | |
| 3429 self.assertEqual(j, o['SlicesShort'][1][0]) | |
| 3430 self.assertEqual(0, o['SlicesShort'][1][1]) | |
| 3431 self.assertEqual(1, o['SlicesShort'][1][2]) | |
| 3432 | |
| 3433 | |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3434 |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3435 def test_incoming_movescu_accession(self): |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3436 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3437 |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
3438 # No matching patient, so no job is created |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3439 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3440 CallMoveScu([ '--study', '-k', '0008,0052=STUDY', '-k', 'AccessionNumber=nope' ]) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3441 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3442 CallMoveScu([ '--study', '-k', '0008,0052=PATIENT', '-k', 'AccessionNumber=A10003245599' ]) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3443 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
3444 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
3445 # 1 Matching patient, track the job |
| 138 | 3446 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
| 3447 '--study', | |
| 3448 '-k', '0008,0052=STUDY', | |
| 3449 '-k', 'AccessionNumber=A10003245599' | |
| 3450 ]))) | |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
3451 |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3452 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
3453 |
| 55 | 3454 |
| 3455 def test_dicom_to_json(self): | |
| 3456 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
|
3457 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
|
3458 |
|
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
3459 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
|
3460 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
|
3461 self.assertTrue(CompareTags(t, json.loads(f.read()), [ |
| 123 | 3462 # Tags for compatibility with DCMTK 3.6.0 |
| 3463 'RETIRED_OtherPatientIDs', | |
| 3464 'OtherPatientIDs', | |
| 3465 'ACR_NEMA_2C_VariablePixelDataGroupLength', | |
|
80
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
3466 ])) |
| 55 | 3467 |
| 3468 t = DoGet(_REMOTE, '/instances/%s/tags' % i) | |
| 3469 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
|
3470 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
|
3471 ])) |
| 55 | 3472 |
|
60
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
3473 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
|
3474 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
|
3475 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
|
3476 ])) |
|
60
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
3477 |
|
372
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3478 |
|
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3479 # 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
|
3480 # following command: |
|
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3481 # $ 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
|
3482 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
|
3483 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
|
3484 a = json.loads(f.read()) |
|
378
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3485 |
|
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3486 # 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
|
3487 # 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
|
3488 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
|
3489 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
|
3490 self.assertFalse('7fe1,1001' in t) |
|
378
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3491 del a['7fe1,0010'] |
|
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3492 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
|
3493 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3494 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
|
3495 self.assertTrue('7fe1,1001' in t) |
|
378
a4b8450a1158
fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
3496 |
|
65
09fc27e0899a
patch for testing windows builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
3497 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
|
3498 tt = (json.dumps(t) |
|
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3499 .replace('2e+022', '2e+22') |
|
e9b03d8f3b78
fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
369
diff
changeset
|
3500 # 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
|
3501 .replace('IllegalPrivatePixelSequence', 'Unknown Tag & Data')) |
|
65
09fc27e0899a
patch for testing windows builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
3502 self.assertEqual(aa, tt) |
| 57 | 3503 |
| 3504 | |
| 3505 def test_batch_archive(self): | |
| 3506 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 3507 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') | |
| 3508 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 3509 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0002.dcm') | |
| 3510 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 3511 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm') | |
| 3512 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 3513 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm') | |
| 3514 | |
| 3515 s = DoPost(_REMOTE, '/tools/create-archive', [ ]) | |
| 3516 z = zipfile.ZipFile(StringIO(s), "r") | |
| 3517 self.assertEqual(0, len(z.namelist())) | |
| 3518 | |
| 3519 # One patient | |
| 3520 s = DoPost(_REMOTE, '/tools/create-archive', [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ]) | |
| 3521 z = zipfile.ZipFile(StringIO(s), "r") | |
| 3522 self.assertEqual(4, len(z.namelist())) | |
| 3523 | |
| 3524 # One patient + twice its study + one series from other patient | |
| 3525 s = DoPost(_REMOTE, '/tools/create-archive', [ | |
| 3526 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17', | |
| 3527 '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918', | |
| 3528 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' | |
| 3529 ]) | |
| 3530 z = zipfile.ZipFile(StringIO(s), "r") | |
| 3531 self.assertEqual(6, len(z.namelist())) | |
| 3532 | |
| 3533 # One patient + one series + one instance | |
| 3534 s = DoPost(_REMOTE, '/tools/create-archive', [ | |
| 3535 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17', | |
| 3536 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0', | |
| 3537 '1d429ccb-bdcc78a1-7d129d6a-ba4966ed-fe4dbd87' | |
| 3538 ]) | |
| 3539 z = zipfile.ZipFile(StringIO(s), "r") | |
| 3540 self.assertEqual(7, len(z.namelist())) | |
|
59
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3541 |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
3542 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2): |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
3543 s = DoGet(_REMOTE, '/tools/create-archive?resources=ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17,1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0,1d429ccb-bdcc78a1-7d129d6a-ba4966ed-fe4dbd87') |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
3544 z = zipfile.ZipFile(StringIO(s), "r") |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
3545 self.assertEqual(7, len(z.namelist())) |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
3546 |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
3547 |
|
59
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3548 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3549 def test_decode_brainix_as_jpeg(self): |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3550 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
|
3551 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3552 j = GetImage(_REMOTE, '/instances/%s/preview' % i) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3553 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3554 self.assertEqual(j.size[0], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3555 self.assertEqual(j.size[1], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3556 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3557 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
|
3558 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3559 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3560 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
|
3561 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3562 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3563 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
|
3564 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3565 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3566 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
|
3567 self.assertEqual('JPEG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3568 self.assertEqual(j.size[0], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3569 self.assertEqual(j.size[1], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3570 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3571 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
|
3572 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
|
3573 self.assertLess(a, b) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3574 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3575 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
|
3576 self.assertEqual('JPEG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3577 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3578 # 16bit encoding is not supported with JPEG |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3579 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
|
3580 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
|
3581 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3582 # No matching content type |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
3583 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
|
3584 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3585 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3586 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3587 def test_media_encodings(self): |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3588 ascii = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3589 latin1 = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3590 latin2 = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3591 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3592 tmp = DoPost(_REMOTE, '/tools/create-media', [ascii,latin1,latin2]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3593 z = zipfile.ZipFile(StringIO(tmp), "r") |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3594 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3595 self.assertEqual(4, len(z.namelist())) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3596 self.assertTrue('IMAGES/IM0' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3597 self.assertTrue('IMAGES/IM1' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3598 self.assertTrue('IMAGES/IM2' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3599 self.assertTrue('DICOMDIR' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3600 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3601 try: |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3602 os.remove('/tmp/DICOMDIR') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3603 except: |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3604 # The file does not exist |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3605 pass |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3606 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3607 z.extract('DICOMDIR', '/tmp') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3608 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ], |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3609 stderr = subprocess.STDOUT).split('\n') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3610 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3611 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ], |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3612 stderr = subprocess.STDOUT).split('\n') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3613 self.assertEqual(1, len(a)) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3614 self.assertEqual('', a[0]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3615 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3616 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3617 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
|
3618 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
|
3619 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
|
3620 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
3621 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
|
3622 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3623 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3624 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
|
3625 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
|
3626 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
|
3627 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
|
3628 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3629 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
|
3630 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
|
3631 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
|
3632 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
|
3633 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3634 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
|
3635 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
|
3636 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
|
3637 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
|
3638 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3639 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
|
3640 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
|
3641 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
|
3642 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
|
3643 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3644 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
|
3645 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
|
3646 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
|
3647 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
|
3648 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3649 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
|
3650 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
|
3651 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
|
3652 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
|
3653 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3654 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
|
3655 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
|
3656 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
|
3657 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
|
3658 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
|
3659 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3660 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
|
3661 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
|
3662 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
|
3663 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
|
3664 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
|
3665 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
|
3666 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3667 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
|
3668 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
|
3669 self.assertEqual(1, len(s)) |
|
176
48cc188ffb09
strip trailing 0 char that appears with some findscu versions
am@osimis.io
parents:
175
diff
changeset
|
3670 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
|
3671 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
|
3672 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
|
3673 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3674 |
|
78
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3675 def test_decode_transfer_syntax(self): |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3676 def Check(t, md5): |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3677 i = UploadInstance(_REMOTE, 'TransferSyntaxes/%s.dcm' % t)['ID'] |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3678 |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
3679 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
|
3680 transferSyntax = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i) |
|
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
3681 self.assertEqual(t, transferSyntax) |
|
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
3682 |
|
78
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3683 if md5 == None: |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3684 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
|
3685 else: |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3686 m = ComputeMD5(DoGet(_REMOTE, '/instances/%s/preview' % i)) |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3687 self.assertEqual(m, md5) |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3688 |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3689 Check('1.2.840.10008.1.2.1', 'fae08d5415c4c0cd2cdbae4522408631') |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3690 Check('1.2.840.10008.1.2.2', 'f3d9784768b8feb54d6a50b6d5c37682') |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3691 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
|
3692 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
|
3693 Check('1.2.840.10008.1.2.4.70', '7132cfbc457305b04b59787030c785d2') |
| 384 | 3694 Check('1.2.840.10008.1.2.5', '6ff51ae525d362e0d04f550a64075a0e') # RLE, supported since Orthanc 1.0.1 |
| 3695 Check('1.2.840.10008.1.2', 'd54aed9f67a100984b42942cc2e9939b') | |
| 3696 | |
| 3697 # The 3 checks below don't work on big-endian | |
| 3698 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
|
3699 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
|
3700 Check('1.2.840.10008.1.2.4.81', '801579ae7cbf28e604ea74f2c99fa2ca') |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
3701 |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
3702 # JPEG2k image, not supported without GDCM plugin |
| 304 | 3703 if not HasGdcmPlugin(_REMOTE): |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
3704 Check('1.2.840.10008.1.2.4.90', None) |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
3705 Check('1.2.840.10008.1.2.4.91', None) |
| 79 | 3706 |
| 3707 | |
| 3708 def test_raw_frame(self): | |
| 3709 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] | |
| 3710 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 3711 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3712 self.assertEqual(512 * 512 * 2, len(a)) | |
| 3713 self.assertEqual(512 * 512 * 2, len(DoGet(_REMOTE, '/instances/%s/frames/23/raw' % s))) | |
| 3714 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/raw' % s)) | |
| 3715 self.assertEqual('1914287dc4d958eca21fdaacfb3482fa', ComputeMD5(a)) | |
| 3716 | |
| 3717 s = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] | |
| 3718 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 3719 self.assertEqual(186274, len(DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s))) | |
| 3720 self.assertEqual(189424, len(DoGet(_REMOTE, '/instances/%s/frames/75/raw' % s))) | |
| 3721 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/76/raw' % s)) | |
| 3722 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3723 self.assertEqual("L", im.mode) | |
| 3724 self.assertEqual(512, im.size[0]) | |
| 3725 self.assertEqual(512, im.size[1]) | |
| 3726 | |
| 3727 # Test an image with 2 JPEG frames spread over multiple fragments | |
| 3728 s = UploadInstance(_REMOTE, 'LenaTwiceWithFragments.dcm')['ID'] | |
| 3729 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 3730 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3731 b = DoGet(_REMOTE, '/instances/%s/frames/1/raw' % s) | |
| 3732 self.assertEqual(69214, len(a)) | |
| 3733 self.assertEqual(ComputeMD5(a), ComputeMD5(b)) | |
| 3734 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/2/raw' % s)) | |
| 3735 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3736 self.assertEqual("RGB", im.mode) | |
| 3737 self.assertEqual(512, im.size[0]) | |
| 3738 self.assertEqual(512, im.size[1]) | |
| 323 | 3739 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % s) # TODO - Doesn't work with GDCM 3.0.7 alone |
| 79 | 3740 self.assertEqual("RGB", im.mode) |
| 3741 self.assertEqual(512, im.size[0]) | |
| 3742 self.assertEqual(512, im.size[1]) | |
| 81 | 3743 |
| 3744 | |
| 3745 | |
| 3746 def test_rest_movescu(self): | |
| 3747 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 3748 | |
| 3749 # Upload 4 instances | |
| 3750 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 3751 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm') | |
| 3752 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 3753 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 3754 | |
| 3755 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 3756 for p in DoGet(_REMOTE, '/patients'): | |
| 3757 DoPost(_REMOTE, '/modalities/orthanctest/store', p) | |
| 3758 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 3759 | |
| 3760 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 3761 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3762 # Move instance Brainix/Flair/IM-0001-0001.dcm |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3763 DoPost(_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3764 'Level' : 'Instance', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3765 'Resources' : [ |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3766 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3767 '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
|
3768 '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
|
3769 '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
|
3770 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3771 ]}) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3772 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3773 # Move series Brainix/Flair/* |
| 81 | 3774 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
| 3775 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 3776 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 3777 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 3778 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3779 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3780 # Reset and test asynchronous C-Move at instance level |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3781 for p in DoGet(_REMOTE, '/patients'): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3782 DoDelete(_REMOTE, '/patients/%s' % p) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3783 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3784 DoPost(_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3785 'Level' : 'Instance', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3786 'Resources' : [ |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3787 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3788 '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
|
3789 '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
|
3790 '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
|
3791 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3792 ], |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3793 'Asynchronous': True |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3794 }) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3795 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3796 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3797 (_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3798 'Level' : 'Instance', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3799 'Resources' : [ |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3800 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3801 '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
|
3802 '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
|
3803 '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
|
3804 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3805 ], |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3806 'Asynchronous': True |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3807 })) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3808 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3809 self.assertNotEqual(None, job) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3810 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3811 # check the job was successfull |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3812 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3813 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3814 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3815 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3816 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3817 # check the job content |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3818 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content'] |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3819 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
|
3820 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
|
3821 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
|
3822 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3823 # Reset and test synchronous C-Move at series level |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3824 for p in DoGet(_REMOTE, '/patients'): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3825 DoDelete(_REMOTE, '/patients/%s' % p) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3826 |
| 81 | 3827 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series', |
| 3828 'Resources' : [ | |
| 3829 { | |
| 3830 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775', | |
| 3831 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', | |
| 3832 } | |
| 3833 ]}) | |
| 3834 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 3835 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 3836 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 3837 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) | |
| 3838 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3839 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3840 # 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
|
3841 for p in DoGet(_REMOTE, '/patients'): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3842 DoDelete(_REMOTE, '/patients/%s' % p) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3843 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3844 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3845 (_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3846 'Level' : 'Series', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3847 'Resources' : [ |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3848 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3849 'PatientID' : '5Yp0E', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3850 '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
|
3851 '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
|
3852 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3853 ], |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3854 'Asynchronous': True |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3855 })) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3856 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3857 self.assertNotEqual(None, job) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3858 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3859 # check the job was successfull |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3860 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3861 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3862 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3863 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3864 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3865 # check the job content |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3866 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content'] |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3867 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
|
3868 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
|
3869 self.assertEqual('5Yp0E', jobContent['Query'][0]['0010,0020']) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3870 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3871 # Move series Brainix/Epi/* |
| 81 | 3872 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series', |
| 3873 'Resources' : [ | |
| 3874 { | |
| 3875 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775', | |
| 3876 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314125550', | |
| 3877 } | |
| 3878 ]}) | |
| 3879 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 3880 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 3881 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 3882 self.assertEqual(3, len(DoGet(_REMOTE, '/instances'))) | |
| 3883 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3884 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3885 # Move study Knee asynchronously |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3886 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3887 (_REMOTE, '/modalities/orthanctest/move', { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3888 'Level' : 'Study', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3889 'Resources' : [ |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3890 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3891 '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
|
3892 } |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3893 ], |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3894 'Asynchronous': True |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3895 })) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3896 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3897 self.assertNotEqual(None, job) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3898 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3899 # check the job was successfull |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3900 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3901 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3902 self.assertEqual(3, len(DoGet(_REMOTE, '/series'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3903 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3904 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3905 # check the job content |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3906 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content'] |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3907 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', jobContent['Query'][0]['0020,000d']) |
| 81 | 3908 |
| 3909 # Reset | |
| 3910 for p in DoGet(_REMOTE, '/patients'): | |
| 3911 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 3912 | |
| 3913 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 3914 | |
| 3915 | |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3916 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3917 # Move all at once asynchronously at PatientLevel |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3918 job = MonitorJob2(_REMOTE, lambda: DoPost(_REMOTE, '/modalities/orthanctest/move', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3919 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3920 'Level' : 'Patient', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3921 'Resources' : [ |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3922 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3923 'PatientID' : '5Yp0E', |
| 81 | 3924 }, |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3925 { |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3926 'PatientID': '887', |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3927 'PatientName' : 'KNEE', |
| 81 | 3928 } |
|
482
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3929 ], |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3930 'Synchronous': False |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3931 })) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3932 |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3933 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3934 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3935 self.assertEqual(3, len(DoGet(_REMOTE, '/series'))) |
|
535e651e70a2
added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents:
473
diff
changeset
|
3936 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) |
| 81 | 3937 |
|
86
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3938 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3939 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3940 def test_reconstruct_json(self): |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3941 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3942 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3943 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3944 first = DoGet(_REMOTE, '/instances/%s/tags' % instance) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3945 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3946 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
|
3947 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3948 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
|
3949 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
|
3950 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3951 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
|
3952 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3953 # Cannot delete the "DICOM" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3954 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
|
3955 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3956 # Can delete the "DICOM as JSON" attachment |
|
392
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
3957 if not IsOrthancVersionAbove(_REMOTE, 1, 9, 1): |
|
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
3958 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
|
3959 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
|
3960 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3961 # Only the "DICOM" attachment subsists |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3962 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance))) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3963 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3964 # Cannot manually reconstruct the "DICOM as JSON" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3965 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
|
3966 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3967 # Transparently reconstruct the "DICOM as JSON" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3968 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
|
3969 second = DoGet(_REMOTE, '/instances/%s/tags' % instance) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3970 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
|
3971 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3972 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
|
3973 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
|
3974 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3975 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
|
3976 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
|
3977 self.assertEqual(str(first), str(third)) |
|
87
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3978 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3979 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3980 def test_reconstruct_json2(self): |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3981 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3982 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3983 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
|
3984 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
|
3985 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3986 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
|
3987 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
|
3988 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3989 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
|
3990 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
|
3991 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3992 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
|
3993 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
|
3994 self.assertEqual(aa, bb) |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3995 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
|
3996 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
|
3997 elif IsDicomUntilPixelDataStored(_REMOTE): |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
3998 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
|
3999 self.assertEqual(aa, bb) |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4000 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
|
4001 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
|
4002 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4003 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
|
4004 self.assertEqual(aa, bb) |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4005 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
|
4006 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4007 # 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
|
4008 DoPost(_REMOTE, '/tools/invalidate-tags', '', 'text/plain') |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
4009 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4010 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
|
4011 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
|
4012 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
|
4013 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4014 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
|
4015 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
|
4016 |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4017 # 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
|
4018 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
|
4019 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
|
4020 |
|
380
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4021 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
|
4022 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
|
4023 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
|
4024 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
4025 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
|
4026 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
|
4027 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
4028 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
4029 def test_private_tags(self): |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
4030 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
4031 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
|
4032 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
|
4033 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
|
4034 |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4035 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4036 def test_findscu_encoding(self): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4037 # Check out ../Database/Encodings/Generate.sh |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4038 TEST = u'Test-éüäöòДΘĝדصķћ๛ﾈİ' |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4039 ENCODINGS = { |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4040 'Arabic' : [ 'ISO_IR 127' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4041 'Ascii' : [ 'ISO_IR 6' ], # More accurately, ISO 646 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4042 'Cyrillic' : [ 'ISO_IR 144' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4043 'Greek' : [ 'ISO_IR 126' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4044 'Hebrew' : [ 'ISO_IR 138' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4045 'Japanese' : [ 'ISO_IR 13', 'shift-jis' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4046 'Latin1' : [ 'ISO_IR 100' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4047 'Latin2' : [ 'ISO_IR 101' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4048 'Latin3' : [ 'ISO_IR 109' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4049 'Latin4' : [ 'ISO_IR 110' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4050 'Latin5' : [ 'ISO_IR 148' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4051 'Thai' : [ 'ISO_IR 166', 'tis-620' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4052 'Utf8' : [ 'ISO_IR 192' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4053 } |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4054 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4055 for name in ENCODINGS.iterkeys(): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4056 if len(ENCODINGS[name]) == 1: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4057 ENCODINGS[name].append(name.lower()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4058 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4059 UploadInstance(_REMOTE, 'Encodings/Lena-utf8.dcm') |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4060 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4061 for name in ENCODINGS.iterkeys(): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4062 self.assertEqual(name, DoPut(_REMOTE, '/tools/default-encoding', name)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4063 self.assertEqual(name, DoGet(_REMOTE, '/tools/default-encoding')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4064 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4065 i = CallFindScu([ '-k', '0008,0052=STUDY', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4066 '-k', 'SpecificCharacterSet', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4067 '-k', 'PatientName' ]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4068 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4069 characterSet = re.findall('\(0008,0005\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4070 self.assertEqual(1, len(characterSet)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4071 self.assertEqual(ENCODINGS[name][0], characterSet[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4072 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4073 patientName = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4074 self.assertEqual(1, len(patientName)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4075 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4076 expected = TEST.encode(ENCODINGS[name][1], 'ignore') |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4077 self.assertEqual(expected, patientName[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4078 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4079 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4080 #for master in ENCODINGS: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4081 for master in [ 'Latin1', 'Utf8', 'Cyrillic' ]: # Shortcut to speedup tests |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4082 self.assertEqual(master, DoPut(_REMOTE, '/tools/default-encoding', master)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4083 self.assertEqual(master, DoGet(_REMOTE, '/tools/default-encoding')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4084 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4085 for name in ENCODINGS: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4086 DropOrthanc(_REMOTE) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4087 UploadInstance(_REMOTE, 'Encodings/Lena-%s.dcm' % ENCODINGS[name][1]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4088 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4089 i = CallFindScu([ '-k', '0008,0052=STUDY', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4090 '-k', 'PatientID', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4091 '-k', 'SpecificCharacterSet', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4092 '-k', 'PatientName' ]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4093 i = i.decode(ENCODINGS[master][1]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4094 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4095 characterSet = re.findall('\(0008,0005\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4096 self.assertEqual(1, len(characterSet)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4097 self.assertEqual(ENCODINGS[master][0], characterSet[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4098 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4099 patientId = re.findall('\(0010,0020\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4100 self.assertEqual(1, len(patientId)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4101 self.assertEqual(ENCODINGS[name][1], patientId[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4102 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4103 patientName = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4104 self.assertEqual(1, len(patientName)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4105 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4106 tmp = ENCODINGS[name][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4107 expected = TEST.encode(tmp, 'ignore').decode(tmp) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4108 tmp = ENCODINGS[master][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4109 expected = expected.encode(tmp, 'ignore').decode(tmp) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4110 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4111 self.assertEqual(expected, patientName[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4112 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4113 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4114 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True, |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4115 'Level' : 'Study', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4116 'Query' : { }}) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4117 self.assertEqual(1, len(a)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4118 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4119 tmp = ENCODINGS[name][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
4120 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
|
4121 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4122 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4123 def test_reconstruct(self): |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4124 def CompareMainDicomTag(expected, instance, level, tag): |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4125 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
|
4126 |
|
504
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
4127 originalInstanceId = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
96
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4128 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4129 studies = DoGet(_REMOTE, '/studies/') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4130 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4131 self.assertEqual(1, len(studies)) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4132 self.assertEqual(1, len(DoGet(_REMOTE, '/series/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4133 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4134 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4135 modified = DoPost(_REMOTE, '/studies/%s/modify' % studies[0], { |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4136 "Replace" : { |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4137 "StudyDescription" : "hello", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4138 "SeriesDescription" : "world", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4139 "SOPClassUID" : "test", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4140 "SOPInstanceUID" : "myid", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4141 }, |
| 119 | 4142 "Keep" : [ "StudyInstanceUID", "SeriesInstanceUID" ], |
| 4143 "Force" : True | |
|
96
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4144 }) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4145 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4146 instances = DoGet(_REMOTE, '/instances/') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4147 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4148 self.assertEqual(1, len(DoGet(_REMOTE, '/studies/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4149 self.assertEqual(1, len(DoGet(_REMOTE, '/series/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4150 self.assertEqual(2, len(instances)) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
4151 |
|
504
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
4152 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
|
4153 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
4154 # 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
|
4155 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
|
4156 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
|
4157 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
|
4158 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
|
4159 CompareMainDicomTag('myid', modifiedInstanceId, '', 'SOPInstanceUID') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
4160 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
|
4161 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
|
4162 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
4163 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
|
4164 # metadata before reconstruct |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
4165 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
|
4166 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
|
4167 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
4168 # 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
|
4169 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
|
4170 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
4171 CompareMainDicomTag('hello', originalInstanceId, 'study', 'StudyDescription') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
4172 CompareMainDicomTag('world', originalInstanceId, 'series', 'SeriesDescription') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
4173 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
|
4174 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
4175 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
|
4176 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
|
4177 # 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
|
4178 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
|
4179 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
|
4180 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
4181 self.assertEqual(mba, maa) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
4182 self.assertEqual(mbb, mab) |
|
473
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
4183 |
|
4ee85b016a40
added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents:
472
diff
changeset
|
4184 |
|
503
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
4185 @unittest.skip("httpbin.org is down as of 2022-12-22") # TODO |
| 104 | 4186 def test_httpClient_lua(self): |
| 496 | 4187 retries = 4 |
|
463
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
4188 result = '' |
|
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
4189 |
| 104 | 4190 with open(GetDatabasePath('Lua/HttpClient.lua'), 'r') as f: |
| 496 | 4191 scriptContent = f.read() |
|
463
29aaa3df718f
added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents:
457
diff
changeset
|
4192 # 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
|
4193 while retries > 0 and not ('OK' in result): |
| 496 | 4194 print("Executing lua script HttpClient.lua") |
| 4195 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
|
4196 retries -= 1 |
| 102 | 4197 |
| 4198 self.assertIn('OK', result) | |
|
107
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4199 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4200 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4201 def test_bitbucket_issue_44(self): |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
4202 # 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
|
4203 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4204 UploadInstance(_REMOTE, 'Issue44/Monochrome2.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4205 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4206 # dcmcjpeg +ua +eb Monochrome1.dcm Monochrome1-Jpeg.dcm |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4207 UploadInstance(_REMOTE, 'Issue44/Monochrome1-Jpeg.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4208 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4209 # dcmcjpeg +ua Monochrome1.dcm Monochrome1-JpegLS.dcm |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4210 UploadInstance(_REMOTE, 'Issue44/Monochrome1-JpegLS.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4211 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4212 monochrome1 = 'bcdd600a-a6a9c522-5f0a6e84-8657c9f3-b76e59b7' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4213 monochrome1_jpeg = '9df82121-208a2da8-0038674a-3d7a773b-b7008cd2' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4214 monochrome1_jpegls = '0486d1a2-9165573f-b1976b20-e927b016-6b8d67ab' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4215 monochrome2 = 'f00947b7-f61f7164-c93414d1-c6fbda6a-9e92ed20' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4216 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4217 for i in [ monochrome1, monochrome1_jpeg, monochrome1_jpegls ]: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4218 im = GetImage(_REMOTE, '/instances/%s/preview' % i) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4219 self.assertEqual("L", im.mode) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4220 self.assertEqual(2010, im.size[0]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4221 self.assertEqual(2446, im.size[1]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4222 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4223 # 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
|
4224 # white (255), should be rendered as black (0) => invert |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4225 if i == monochrome1_jpeg: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4226 # Add some tolerance because of JPEG destructive compression |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4227 self.assertGreater(10, im.getpixel((0,0))) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4228 else: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4229 self.assertEqual(0, im.getpixel((0,0))) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4230 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4231 im = GetImage(_REMOTE, '/instances/%s/preview' % monochrome2) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4232 self.assertEqual("L", im.mode) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4233 self.assertEqual(1572, im.size[0]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4234 self.assertEqual(2010, im.size[1]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4235 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4236 # 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
|
4237 # white (255), should be rendered as white (255) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
4238 self.assertEqual(255, im.getpixel((0,0))) |
|
111
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
4239 |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
4240 |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
4241 def test_bitbucket_issue_42(self): |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
4242 # https://bugs.orthanc-server.com/show_bug.cgi?id=42 |
| 123 | 4243 # 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
|
4244 UploadInstance(_REMOTE, 'Issue42.dcm')['ID'] |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
4245 modified = DoPost(_REMOTE, |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
4246 '/patients/da128605-e040d0c4-310615d2-3475da63-df2d1ef4/modify', |
| 119 | 4247 '{"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
|
4248 'application/json') |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
4249 self.assertTrue('PatientID' in modified) |
|
113
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4250 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4251 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4252 def test_rest_find_limit(self): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4253 # Check the "Since" and "Limit" parameters in URI "/tools/find" |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
4254 # 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
|
4255 |
|
113
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4256 # Upload 6 instances |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4257 brainix = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4258 knee = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4259 for i in range(2): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4260 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
|
4261 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
|
4262 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
|
4263 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4264 # Check using BRAINIX |
| 667 | 4265 # The tests below correspond to "isSimpleLookup_ == true" in "ResourceFinder" |
|
113
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4266 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4267 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4268 'Limit' : 10 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4269 self.assertEqual(4, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4270 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4271 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4272 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4273 'Limit' : 4 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4274 self.assertEqual(4, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4275 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4276 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4277 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4278 'Since' : 2, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4279 'Limit' : 4 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4280 self.assertEqual(2, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4281 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4282 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4283 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4284 'Limit' : 3 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4285 self.assertEqual(3, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4286 |
|
665
e024ba9e7768
extended test_rest_find_limit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
664
diff
changeset
|
4287 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
e024ba9e7768
extended test_rest_find_limit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
664
diff
changeset
|
4288 'Query' : { 'PatientName' : 'B*' }, |
|
e024ba9e7768
extended test_rest_find_limit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
664
diff
changeset
|
4289 'Limit' : 0 }) # This is an arbitrary convention |
|
e024ba9e7768
extended test_rest_find_limit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
664
diff
changeset
|
4290 self.assertEqual(4, len(a)) |
|
e024ba9e7768
extended test_rest_find_limit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
664
diff
changeset
|
4291 |
|
113
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4292 b = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4293 for i in range(4): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4294 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4295 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4296 'Limit' : 1, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4297 'Since' : i }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4298 self.assertEqual(1, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4299 b.append(a[0]) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4300 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4301 # 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
|
4302 self.assertEqual(0, len(set(b) ^ set(brainix))) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4303 |
|
665
e024ba9e7768
extended test_rest_find_limit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
664
diff
changeset
|
4304 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
e024ba9e7768
extended test_rest_find_limit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
664
diff
changeset
|
4305 'Query' : { 'PatientName' : 'B*' }, |
|
e024ba9e7768
extended test_rest_find_limit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
664
diff
changeset
|
4306 'Limit' : 1, |
|
e024ba9e7768
extended test_rest_find_limit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
664
diff
changeset
|
4307 'Since' : 4 }) |
|
e024ba9e7768
extended test_rest_find_limit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
664
diff
changeset
|
4308 self.assertEqual(0, len(a)) |
|
e024ba9e7768
extended test_rest_find_limit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
664
diff
changeset
|
4309 |
|
113
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4310 # Check using KNEE |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4311 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4312 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4313 'Limit' : 10 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4314 self.assertEqual(2, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4315 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4316 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4317 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4318 'Limit' : 2 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4319 self.assertEqual(2, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4320 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4321 b = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4322 for i in range(2): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4323 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4324 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4325 'Limit' : 1, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4326 'Since' : i }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4327 self.assertEqual(1, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4328 b.append(a[0]) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4329 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
4330 self.assertEqual(0, len(set(b) ^ set(knee))) |
|
115
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4331 |
| 667 | 4332 # Now test "isSimpleLookup_ == false" |
| 4333 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 4334 'Query' : { 'PatientPosition' : '*' }}) | |
| 4335 self.assertEqual(3, len(a)) | |
| 4336 | |
|
735
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4337 if not HasExtendedFind(_REMOTE): # once you have ExtendedFind, usage of Limit and Since is forbidden when filtering on tags that are not in DB because that's just impossible to use on real life DB ! |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4338 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4339 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4340 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4341 'Query' : { 'PatientPosition' : '*' }, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4342 'Limit' : 0}) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4343 self.assertEqual(3, len(b)) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4344 self.assertEqual(a[0], b[0]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4345 self.assertEqual(a[1], b[1]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4346 self.assertEqual(a[2], b[2]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4347 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4348 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4349 'Query' : { 'PatientPosition' : '*' }, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4350 'Limit' : 1}) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4351 self.assertEqual(1, len(b)) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4352 self.assertEqual(a[0], b[0]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4353 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4354 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4355 'Query' : { 'PatientPosition' : '*' }, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4356 'Since' : 0, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4357 'Limit' : 1}) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4358 self.assertEqual(1, len(b)) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4359 self.assertEqual(a[0], b[0]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4360 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4361 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4362 'Query' : { 'PatientPosition' : '*' }, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4363 'Since' : 0, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4364 'Limit' : 3}) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4365 self.assertEqual(3, len(b)) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4366 self.assertEqual(a[0], b[0]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4367 self.assertEqual(a[1], b[1]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4368 self.assertEqual(a[2], b[2]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4369 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4370 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4371 'Query' : { 'PatientPosition' : '*' }, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4372 'Since' : 0, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4373 'Limit' : 4}) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4374 self.assertEqual(3, len(b)) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4375 self.assertEqual(a[0], b[0]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4376 self.assertEqual(a[1], b[1]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4377 self.assertEqual(a[2], b[2]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4378 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4379 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4380 'Query' : { 'PatientPosition' : '*' }, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4381 'Since' : 1, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4382 'Limit' : 1}) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4383 self.assertEqual(1, len(b)) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4384 self.assertEqual(a[1], b[0]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4385 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4386 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4387 'Query' : { 'PatientPosition' : '*' }, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4388 'Since' : 1, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4389 'Limit' : 2}) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4390 self.assertEqual(2, len(b)) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4391 self.assertEqual(a[1], b[0]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4392 self.assertEqual(a[2], b[1]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4393 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4394 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4395 'Query' : { 'PatientPosition' : '*' }, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4396 'Since' : 1, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4397 'Limit' : 3}) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4398 self.assertEqual(2, len(b)) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4399 self.assertEqual(a[1], b[0]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4400 self.assertEqual(a[2], b[1]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4401 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4402 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4403 'Query' : { 'PatientPosition' : '*' }, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4404 'Since' : 2, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4405 'Limit' : 1}) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4406 self.assertEqual(1, len(b)) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4407 self.assertEqual(a[2], b[0]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4408 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4409 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4410 'Query' : { 'PatientPosition' : '*' }, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4411 'Since' : 2, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4412 'Limit' : 2}) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4413 self.assertEqual(1, len(b)) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4414 self.assertEqual(a[2], b[0]) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4415 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4416 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4417 'Query' : { 'PatientPosition' : '*' }, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4418 'Since' : 3, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4419 'Limit' : 1}) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4420 self.assertEqual(0, len(b)) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4421 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4422 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4423 'Query' : { 'PatientPosition' : '*' }, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4424 'Since' : 3, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4425 'Limit' : 10}) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
4426 self.assertEqual(0, len(b)) |
| 667 | 4427 |
|
115
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4428 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4429 def test_bitbucket_issue_46(self): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4430 # "PHI remaining after anonymization" |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
4431 # 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
|
4432 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4433 def GetAnonymizedTags(study, version): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4434 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4435 { 'DicomVersion' : version }, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4436 'application/json') ['ID'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4437 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4438 self.assertEqual(1, len(a)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4439 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4440 instance = a[0]['ID'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4441 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4442 return (instance, DoGet(_REMOTE, '/instances/%s/tags' % instance)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4443 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4444 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm') |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4445 origStudy = '6068a14b-d4df27af-9ec22145-538772d8-74f228ff' |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4446 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4447 # 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
|
4448 # (Patient's Mother's Birth Name) tags |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4449 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4450 '{"Replace":{"0010,1060":"OSIMIS","0032,1033":"MOTHER"}}', |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4451 'application/json')['ID'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4452 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4453 # 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
|
4454 # 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
|
4455 (instance, tags) = GetAnonymizedTags(newStudy, "2008") |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4456 self.assertTrue('0032,1033' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4457 self.assertTrue('0010,1060' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4458 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4459 # 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
|
4460 # 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
|
4461 (instance, tags) = GetAnonymizedTags(newStudy, "2017c") |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4462 self.assertFalse('0032,1033' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4463 self.assertFalse('0010,1060' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4464 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4465 t = {} |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4466 for (key, value) in tags.iteritems(): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4467 t[value['Name']] = value['Value'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4468 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4469 self.assertEqual('', t['StudyDate']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4470 self.assertEqual('', t['StudyTime']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4471 self.assertEqual('', t['PatientSex']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4472 self.assertFalse('SeriesDate' in t) # Type 3 tag => null |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4473 self.assertFalse('SeriesTime' in t) # Type 3 tag => null |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4474 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4475 with tempfile.NamedTemporaryFile(delete = True) as f: |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4476 # 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
|
4477 f.write(DoGet(_REMOTE, '/instances/%s/file' % instance)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4478 f.flush() |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4479 subprocess.check_output([ FindExecutable('dciodvfy'), f.name ], |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
4480 stderr = subprocess.STDOUT).split('\n') |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4481 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4482 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4483 def test_bitbucket_issue_55(self): |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4484 def Run(modify, query): |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4485 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4486 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4487 operation = 'modify' if modify else 'anonymize' |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4488 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4489 self.assertRaises(Exception, lambda: DoPost( |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4490 _REMOTE, '/studies/%s/%s' % (study, operation), query)) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4491 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4492 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4493 query["Force"] = True |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4494 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
|
4495 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4496 DoDelete(_REMOTE, a) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4497 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4498 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4499 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4500 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4501 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4502 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4503 Run(True, { "Replace" : { "StudyInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4504 Run(True, { "Replace" : { "SeriesInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4505 Run(True, { "Replace" : { "SOPInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4506 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4507 Run(False, { "Keep" : [ "StudyInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4508 Run(False, { "Keep" : [ "SeriesInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4509 Run(False, { "Keep" : [ "SOPInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4510 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4511 Run(False, { "Replace" : { "StudyInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4512 Run(False, { "Replace" : { "SeriesInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4513 Run(False, { "Replace" : { "SOPInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
4514 |
|
120
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4515 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4516 def test_bitbucket_issue_56(self): |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4517 # Case-insensitive matching over accents. This test assumes |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4518 # that the "CaseSensitivePN" configuration option of Orthanc |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4519 # is set to "false" (default value). |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
4520 # 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
|
4521 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4522 def Check(name, expected, expectedSensitive): |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4523 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
|
4524 '-k', '0008,0052=PATIENT', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4525 '-k', 'PatientName=%s' % name ]) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4526 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', a) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4527 self.assertEqual(expected, len(patientNames)) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4528 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4529 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4530 'CaseSensitive' : False, |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4531 'Query' : { 'PatientName' : name }}) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4532 self.assertEqual(expected, len(a)) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4533 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4534 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4535 'CaseSensitive' : True, |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4536 'Query' : { 'PatientName' : name }}) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4537 self.assertEqual(expectedSensitive, len(a)) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4538 |
| 533 | 4539 # SpecificCharacterSet = ISO_IR 100 (Latin1), PatientName=Test-éüäöò |
|
120
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4540 UploadInstance(_REMOTE, 'Encodings/Lena-latin1.dcm') |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4541 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4542 # WildcardConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4543 Check('TeSt*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4544 Check('TeSt-a*', 0, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4545 Check('TeSt-É*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4546 Check('TeSt-é*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4547 Check('Test-é*', 1, 1) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4548 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4549 # ListConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4550 Check('Test-éüäöò\\nope', 1, 1) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4551 Check('Test-ÉÜÄÖÒ\\nope', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4552 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4553 # ValueConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4554 Check('Test-éüäöò', 1, 1) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4555 Check('Test-ÉÜÄÖÒ', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
4556 |
| 125 | 4557 |
| 4558 def test_gbk_alias(self): | |
| 4559 # https://groups.google.com/d/msg/orthanc-users/WMM8LMbjpUc/02-1f_yFCgAJ | |
| 4560 # This test fails on Orthanc <= 1.3.0 | |
| 4561 i = UploadInstance(_REMOTE, '2017-09-19-GBK-Tumashu.dcm')['ID'] | |
| 4562 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) | |
| 4563 self.assertEqual(tags['PatientName'], u'徐浩凯') | |
| 4564 self.assertEqual(tags['InstitutionName'], u'灌云县疾病预防控制中心') | |
| 126 | 4565 |
| 4566 | |
| 4567 def test_long_tag(self): | |
| 4568 i = UploadInstance(_REMOTE, 'DummyCTWithLongTag.dcm')['ID'] | |
| 4569 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 4570 | |
| 4571 tags = DoGet(_REMOTE, '/instances/%s/tags' % i) | |
| 4572 self.assertTrue('0018,1020' in tags) | |
| 4573 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name']) | |
| 4574 self.assertEqual('TooLong', tags['0018,1020']['Type']) | |
| 4575 self.assertEqual(None, tags['0018,1020']['Value']) | |
| 4576 | |
| 4577 tags = DoGet(_REMOTE, '/instances/%s/tags?ignore-length=0018-1020' % i) | |
| 4578 self.assertTrue('0018,1020' in tags) | |
| 4579 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name']) | |
| 4580 self.assertEqual('String', tags['0018,1020']['Type']) | |
| 4581 self.assertTrue(tags['0018,1020']['Value'].startswith('Lorem ipsum dolor sit amet')) | |
| 4582 | |
| 4583 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) | |
| 4584 self.assertTrue('SoftwareVersions' in tags) | |
| 4585 self.assertEqual(None, tags['SoftwareVersions']) | |
| 4586 self.assertTrue('HeartRate' in tags) | |
| 4587 self.assertEqual(474, int(tags['HeartRate'])) | |
| 4588 | |
| 4589 tags = DoGet(_REMOTE, '/instances/%s/simplified-tags' % i) | |
| 4590 self.assertTrue('SoftwareVersions' in tags) | |
| 4591 self.assertEqual(None, tags['SoftwareVersions']) | |
| 4592 | |
| 4593 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify&ignore-length=0018-1020' % i) | |
| 4594 self.assertTrue('SoftwareVersions' in tags) | |
| 4595 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet')) | |
| 4596 | |
| 4597 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify&ignore-length=SoftwareVersions' % i) | |
| 4598 self.assertTrue('SoftwareVersions' in tags) | |
| 4599 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet')) | |
| 4600 | |
| 4601 tags = DoGet(_REMOTE, '/series/%s/instances-tags' % series) | |
| 4602 self.assertEqual(1, len(tags)) | |
| 4603 self.assertTrue(i in tags.keys()) | |
| 4604 self.assertTrue('0018,1020' in tags[i]) | |
| 4605 self.assertEqual('TooLong', tags[i]['0018,1020']['Type']) | |
| 4606 | |
| 4607 tags = DoGet(_REMOTE, '/series/%s/instances-tags?ignore-length=SoftwareVersions' % series) | |
| 4608 self.assertEqual(1, len(tags)) | |
| 4609 self.assertTrue(i in tags.keys()) | |
| 4610 self.assertTrue('0018,1020' in tags[i]) | |
| 4611 self.assertEqual('String', tags[i]['0018,1020']['Type']) | |
| 4612 self.assertTrue(tags[i]['0018,1020']['Value'].startswith('Lorem ipsum dolor sit amet')) | |
| 4613 | |
|
127
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4614 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4615 def test_extended_media(self): |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4616 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4617 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4618 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
|
4619 self.assertEqual(2, len(z.namelist())) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4620 self.assertTrue('IMAGES/IM0' in z.namelist()) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4621 self.assertTrue('DICOMDIR' in z.namelist()) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4622 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4623 try: |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4624 os.remove('/tmp/DICOMDIR') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4625 except: |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4626 # The file does not exist |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4627 pass |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4628 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4629 z.extract('DICOMDIR', '/tmp') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4630 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ], |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4631 stderr = subprocess.STDOUT).split('\n') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4632 self.assertEqual(5, len(a)) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4633 self.assertTrue(a[0].startswith('Warning')) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4634 self.assertEqual('BasicDirectory', a[1]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4635 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
|
4636 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
|
4637 self.assertEqual('', a[4]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4638 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4639 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ], |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4640 stderr = subprocess.STDOUT).split('\n') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4641 self.assertEqual(1, len(a)) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4642 self.assertEqual('', a[0]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4643 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4644 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4645 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
|
4646 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4647 # Check the presence of the series description (extended tag) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4648 self.assertTrue(re.search('T1W_aTSE', a) != None) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4649 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4650 os.remove('/tmp/DICOMDIR') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4651 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
4652 |
|
132
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4653 def test_anonymize_relationships_1(self): |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4654 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4655 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
|
4656 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4657 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4658 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4659 '{}', |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4660 'application/json')['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4661 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4662 a = DoGet(_REMOTE, '/studies/%s/instances' % study) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4663 self.assertEqual(2, len(a)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4664 a1 = a[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4665 a2 = a[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4666 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4667 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4668 self.assertEqual(2, len(b)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4669 b1 = b[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4670 b2 = b[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4671 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4672 SEQUENCE = '/instances/%s/content/ReferencedImageSequence' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4673 SOP = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPInstanceUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4674 CLASS = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPClassUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4675 FRAME = '/instances/%s/content/FrameOfReferenceUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4676 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4677 self.assertEqual(DoGet(_REMOTE, FRAME % a1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4678 DoGet(_REMOTE, FRAME % a2)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4679 self.assertEqual(DoGet(_REMOTE, FRAME % b1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4680 DoGet(_REMOTE, FRAME % b2)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4681 self.assertNotEqual(DoGet(_REMOTE, FRAME % a1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4682 DoGet(_REMOTE, FRAME % b1)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4683 self.assertNotEqual(DoGet(_REMOTE, FRAME % a2), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4684 DoGet(_REMOTE, FRAME % b2)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4685 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4686 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
|
4687 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
|
4688 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
|
4689 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
|
4690 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4691 for i in range(3): |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4692 self.assertEqual(DoGet(_REMOTE, SOP % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4693 DoGet(_REMOTE, SOP % (a2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4694 self.assertEqual(DoGet(_REMOTE, SOP % (b1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4695 DoGet(_REMOTE, SOP % (b2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4696 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4697 DoGet(_REMOTE, SOP % (b1, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4698 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4699 DoGet(_REMOTE, SOP % (b2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4700 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4701 DoGet(_REMOTE, CLASS % (b1, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4702 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4703 DoGet(_REMOTE, CLASS % (b2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4704 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4705 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4706 def test_anonymize_relationships_2(self): |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4707 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm') |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4708 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
|
4709 study = '6c65289b-db2fcb71-7eaf73f4-8e12470c-a4d6d7cf' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4710 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4711 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4712 '{}', |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4713 'application/json')['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4714 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4715 a = DoGet(_REMOTE, '/studies/%s/instances' % study) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4716 self.assertEqual(2, len(a)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4717 a1 = a[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4718 a2 = a[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4719 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4720 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4721 self.assertEqual(2, len(b)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4722 b1 = b[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4723 b2 = b[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4724 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4725 SEQUENCE = '/instances/%s/content/SourceImageSequence' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4726 SOP = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPInstanceUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4727 CLASS = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPClassUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4728 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4729 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
|
4730 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
|
4731 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
|
4732 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
|
4733 self.assertEqual(DoGet(_REMOTE, SOP % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4734 DoGet(_REMOTE, SOP % (a2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4735 self.assertEqual(DoGet(_REMOTE, SOP % (b1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4736 DoGet(_REMOTE, SOP % (b2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4737 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4738 DoGet(_REMOTE, SOP % (b1, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4739 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4740 DoGet(_REMOTE, SOP % (b2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4741 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4742 DoGet(_REMOTE, CLASS % (b1, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4743 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
4744 DoGet(_REMOTE, CLASS % (b2, 0))) |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4745 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4746 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4747 def test_anonymize_relationships_3(self): |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4748 sr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM0')['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4749 mr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM631')['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4750 study = 'ef351eb2-c1147229-062736b8-35a151e3-e32d526b' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4751 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4752 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4753 { "Keep" : [ "ContentSequence" ] }) ['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4754 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4755 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4756 self.assertEqual(2, len(a)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4757 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4758 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
|
4759 sr2 = a[0]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4760 mr2 = a[1]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4761 else: |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4762 sr2 = a[1]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4763 mr2 = a[0]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4764 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4765 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % sr1), |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4766 DoGet(_REMOTE, '/instances/%s/content/Modality' % sr2)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4767 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % mr1), |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4768 DoGet(_REMOTE, '/instances/%s/content/Modality' % mr2)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4769 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4770 mrUid1 = DoGet(_REMOTE, '/instances/%s' % mr1)['MainDicomTags']['SOPInstanceUID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4771 mrUid2 = DoGet(_REMOTE, '/instances/%s' % mr2)['MainDicomTags']['SOPInstanceUID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4772 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
|
4773 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
|
4774 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
|
4775 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
|
4776 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4777 PATH1 = '/instances/%s/content/CurrentRequestedProcedureEvidenceSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4778 PATH2 = PATH1 + '/0/ReferencedSeriesSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4779 PATH3 = PATH2 + '/0/ReferencedSOPSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4780 PATH4 = PATH3 + '/0/ReferencedSOPInstanceUID' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4781 PATH5 = PATH3 + '/0/ReferencedSOPClassUID' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4782 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4783 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4784 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4785 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4786 self.assertEqual(DoGet(_REMOTE, PATH4 % sr1), mrUid1) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4787 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
|
4788 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
|
4789 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4790 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4791 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4792 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4793 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
|
4794 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4795 self.assertEqual(mrUid2, DoGet(_REMOTE, PATH4 % sr2).strip('\x00')) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4796 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
|
4797 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
|
4798 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4799 content1 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr1) ['ContentSequence'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4800 content2 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr2) ['ContentSequence'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
4801 self.assertEqual(str(content1), str(content2)) |
|
141
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4802 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4803 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4804 def test_bitbucket_issue_94(self): |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4805 # "a simple instance modification should not modify FrameOfReferenceUID + ..." |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
4806 # 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
|
4807 i = UploadInstance(_REMOTE, 'Issue94.dcm')['ID'] |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4808 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4809 source = DoGet(_REMOTE, '/instances/%s/attachments/dicom/data' % i) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4810 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4811 modified = DoPost(_REMOTE, '/instances/%s/modify' % i, |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4812 { "Replace" : {"PatientID" : "toto"}, "Force": True}) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4813 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4814 anonymized = DoPost(_REMOTE, '/instances/%s/anonymize' % i) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4815 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4816 a = ExtractDicomTags(source, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4817 self.assertEqual(1, len(a)) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4818 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4819 b = ExtractDicomTags(modified, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4820 self.assertEqual(1, len(b)) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4821 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4822 c = ExtractDicomTags(anonymized, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4823 self.assertEqual(1, len(c)) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4824 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4825 self.assertEqual(a, b) # Modified DICOM |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
4826 self.assertNotEqual(a, c) # Anonymized DICOM |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4827 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4828 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4829 def test_metadata_origin(self): |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4830 # Upload using the REST API |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4831 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
|
4832 self.assertEqual('RestApi', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4833 self.assertEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4834 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4835 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/metadata/CalledAET' % i)) |
| 315 | 4836 |
| 4837 # "HttpUsername" is empty iff "AuthenticationEnabled" is "false" | |
| 4838 self.assertTrue(DoGet(_REMOTE, '/instances/%s/metadata/HttpUsername' % i) in [ '', 'alice' ]) | |
| 4839 | |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4840 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4841 self.assertEqual('RestApi', m['Origin']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4842 self.assertEqual('', m['RemoteAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4843 self.assertNotEqual('', m['RemoteIP']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4844 self.assertFalse('CalledAET' in m) |
| 315 | 4845 self.assertTrue('HttpUsername' in m) |
| 4846 self.assertTrue(m['HttpUsername'] in [ '', 'alice' ]) | |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4847 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4848 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
|
4849 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
|
4850 self.assertEqual('1', m['IndexInSeries']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4851 self.assertTrue('ReceptionDate' in m) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4852 |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4853 DoDelete(_REMOTE, '/instances/%s' % i) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4854 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4855 # Upload using the DICOM protocol |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4856 subprocess.check_call([ FindExecutable('storescu'), |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4857 _REMOTE['Server'], str(_REMOTE['DicomPort']), |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4858 GetDatabasePath('Knee/T1/IM-0001-0001.dcm'), |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4859 '-xw' ]) # Propose JPEG2000 |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4860 self.assertEqual('DicomProtocol', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4861 self.assertEqual('STORESCU', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4862 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
4863 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
|
4864 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
|
4865 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4866 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4867 self.assertEqual('DicomProtocol', m['Origin']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4868 self.assertEqual('STORESCU', m['RemoteAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4869 self.assertNotEqual('', m['RemoteIP']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4870 self.assertEqual('ANY-SCP', m['CalledAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4871 self.assertFalse('HttpUsername' in m) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4872 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4873 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
|
4874 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
|
4875 self.assertEqual('1', m['IndexInSeries']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
4876 self.assertTrue('ReceptionDate' in m) |
| 147 | 4877 |
| 4878 | |
| 4879 def test_lua_deadlock(self): | |
| 4880 # Rana Asim Wajid (2018-07-14): "It does seem that the issue | |
| 4881 # is with the lua script I'm using for conversion of images to | |
| 4882 # JPEG2000. When the script is used with 1.4.0 the first | |
| 4883 # instance appears to be stored and then everything just | |
| 4884 # halts, ie Orthanc wont respond to anything after that." | |
| 4885 # https://groups.google.com/d/msg/orthanc-users/Rc-Beb42xc8/JUgdzrmCAgAJ | |
| 174 | 4886 InstallLuaScriptFromPath(_REMOTE, 'Lua/Jpeg2000Conversion.lua') |
| 147 | 4887 |
| 4888 subprocess.check_call([ FindExecutable('storescu'), | |
| 4889 _REMOTE['Server'], str(_REMOTE['DicomPort']), | |
| 4890 GetDatabasePath('Brainix/Flair/IM-0001-0001.dcm'), | |
| 4891 GetDatabasePath('Brainix/Flair/IM-0001-0002.dcm'), | |
| 4892 ]) | |
| 4893 | |
| 4894 instances = DoGet(_REMOTE, '/instances') | |
| 4895 self.assertEqual(2, len(instances)) | |
| 4896 | |
| 4897 t1 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[0]) | |
| 4898 t2 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[1]) | |
| 175 | 4899 self.assertEqual('1.2.840.10008.1.2.4.90', t1) # this will fail if libgdcm-tools is not installed |
| 147 | 4900 self.assertEqual(t1, t2); |
|
154
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4901 |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4902 |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4903 def test_find_group_length(self): |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4904 # 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
|
4905 # one of the Generic Group Length tags (*, 0x0000) |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4906 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
|
4907 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
|
4908 self.assertFalse('UnableToProcess' in result) |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
4909 self.assertFalse('E:' in result) |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4910 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4911 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4912 def test_split(self): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4913 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4914 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
|
4915 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
|
4916 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
|
4917 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4918 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4919 t2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4920 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4921 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4922 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4923 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4924 info = DoGet(_REMOTE, '/studies/%s' % study) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4925 self.assertTrue('ReferringPhysicianName' in info['MainDicomTags']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4926 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4927 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4928 (_REMOTE, '/studies/%s/split' % study, { |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4929 'Series' : [ t2 ], |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4930 'Replace' : { 'PatientName' : 'Hello' }, |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4931 'Remove' : [ 'ReferringPhysicianName' ], |
| 181 | 4932 'KeepSource' : False, |
| 4933 'Asynchronous' : True | |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4934 })) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4935 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4936 self.assertNotEqual(None, job) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4937 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4938 studies = set(DoGet(_REMOTE, '/studies')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4939 self.assertEqual(2, len(studies)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4940 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4941 series = set(DoGet(_REMOTE, '/series')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4942 self.assertEqual(2, len(series)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4943 self.assertTrue(t1 in series) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4944 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4945 study2 = DoGet(_REMOTE, '/jobs/%s' % job)['Content']['TargetStudy'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4946 self.assertTrue(study in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4947 self.assertTrue(study2 in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4948 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4949 info = DoGet(_REMOTE, '/studies/%s' % study2) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4950 self.assertTrue('Hello', info['PatientMainDicomTags']['PatientName']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4951 self.assertFalse('ReferringPhysicianName' in info['MainDicomTags']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4952 |
|
254
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4953 sopInstanceUids = set() |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4954 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
|
4955 sopInstanceUids.add(i['MainDicomTags']['SOPInstanceUID']) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4956 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4957 self.assertTrue(knee1Sop in sopInstanceUids) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4958 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4959 # Fails if Orthanc <= 1.5.7 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4960 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
|
4961 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4962 # 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
|
4963 self.assertEqual(2, len(sopInstanceUids)) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
4964 |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4965 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4966 def test_merge(self): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4967 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
|
4968 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
|
4969 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
|
4970 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
|
4971 knee = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4972 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4973 brainix = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4974 flair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4975 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4976 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4977 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4978 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4979 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4980 (_REMOTE, '/studies/%s/merge' % knee, { |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4981 'Resources' : [ brainix ], |
| 181 | 4982 'KeepSource' : True, |
| 4983 'Synchronous' : False | |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4984 })) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4985 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4986 self.assertNotEqual(None, job) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4987 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4988 studies = set(DoGet(_REMOTE, '/studies')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4989 self.assertEqual(2, len(studies)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4990 self.assertTrue(knee in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4991 self.assertTrue(brainix in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4992 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4993 series = set(DoGet(_REMOTE, '/studies/%s' % knee)['Series']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4994 self.assertTrue(t1 in series) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4995 series.remove(t1) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4996 self.assertEqual(1, len(series)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4997 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4998 instances = DoGet(_REMOTE, '/series/%s' % list(series)[0])['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4999 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5000 merged = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5001 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5002 instances = DoGet(_REMOTE, '/series/%s' % t1)['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5003 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5004 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5005 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5006 instances = DoGet(_REMOTE, '/series/%s' % flair)['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5007 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5008 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5009 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5010 tags = DoGet(_REMOTE, '/studies/%s' % knee) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5011 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5012 for key in tags['PatientMainDicomTags']: |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5013 self.assertEqual(a[key], merged[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5014 if (key in b and key != 'PatientSex'): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5015 self.assertNotEqual(a[key], b[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5016 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5017 for key in tags['MainDicomTags']: |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5018 # Not in the patient/study module |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5019 if (not key in [ 'InstitutionName', |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5020 'RequestingPhysician', |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5021 'RequestedProcedureDescription', ]): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5022 self.assertEqual(a[key], merged[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5023 if (key in b): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5024 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
|
5025 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
5026 sopInstanceUids = set() |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
5027 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
|
5028 sopInstanceUids.add(i['MainDicomTags']['SOPInstanceUID']) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
5029 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
5030 self.assertTrue(kneeSop in sopInstanceUids) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
5031 self.assertTrue(brainixSop in sopInstanceUids) |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
5032 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
5033 # Fails if Orthanc <= 1.5.7 |
|
05b77ade5e1d
test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
247
diff
changeset
|
5034 # 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
|
5035 self.assertEqual(3, len(sopInstanceUids)) |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
5036 |
| 187 | 5037 |
| 5038 def test_async_archive(self): | |
| 5039 # Testing the asynchronous generation of archives/medias (new | |
| 5040 # in Orthanc 1.4.3) | |
| 5041 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 5042 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 5043 | |
| 5044 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' | |
| 5045 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' | |
| 5046 | |
| 5047 job = MonitorJob2(_REMOTE, lambda: DoPost | |
| 508 | 5048 (_REMOTE, '/series/%s/archive' % kneeT1, { |
| 187 | 5049 'Synchronous' : False |
| 5050 })) | |
| 5051 | |
| 5052 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) | |
| 5053 self.assertEqual(1, len(z.namelist())) | |
| 5054 self.assertFalse('DICOMDIR' in z.namelist()) | |
| 5055 | |
|
354
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5056 info = DoGet(_REMOTE, '/jobs/%s' % job) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5057 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
|
5058 self.assertEqual(1, info['Content']['InstancesCount']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5059 self.assertEqual(0, info['Content']['UncompressedSizeMB']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5060 |
| 187 | 5061 job2 = MonitorJob2(_REMOTE, lambda: DoPost |
| 508 | 5062 (_REMOTE, '/series/%s/media' % kneeT1, { |
| 187 | 5063 'Synchronous' : False |
| 5064 })) | |
| 5065 | |
| 5066 # The archive from the first job has been replaced by the | |
| 5067 # archive from second job (as MediaArchiveSize == 1) | |
| 5068 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job)) | |
| 5069 | |
| 5070 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job2) | |
| 5071 self.assertEqual(2, len(z.namelist())) | |
| 5072 self.assertTrue('DICOMDIR' in z.namelist()) | |
| 5073 | |
|
354
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5074 info = DoGet(_REMOTE, '/jobs/%s' % job2) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5075 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
|
5076 self.assertEqual(1, info['Content']['InstancesCount']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5077 self.assertEqual(0, info['Content']['UncompressedSizeMB']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5078 |
| 187 | 5079 job = MonitorJob2(_REMOTE, lambda: DoPost |
| 5080 (_REMOTE, '/tools/create-archive', { | |
| 5081 'Synchronous' : False, | |
| 5082 'Resources' : [ kneeT1, kneeT2 ], | |
| 5083 })) | |
| 5084 | |
| 5085 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) | |
| 5086 self.assertEqual(2, len(z.namelist())) | |
| 5087 self.assertFalse('DICOMDIR' in z.namelist()) | |
| 5088 | |
|
354
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5089 info = DoGet(_REMOTE, '/jobs/%s' % job) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5090 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
|
5091 self.assertEqual(2, info['Content']['InstancesCount']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5092 self.assertEqual(0, info['Content']['UncompressedSizeMB']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5093 |
| 187 | 5094 job = MonitorJob2(_REMOTE, lambda: DoPost |
| 5095 (_REMOTE, '/tools/create-media', { | |
| 5096 'Synchronous' : False, | |
| 5097 'Resources' : [ kneeT1, kneeT2 ], | |
| 5098 })) | |
| 5099 | |
| 5100 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) | |
| 5101 self.assertEqual(3, len(z.namelist())) | |
| 5102 self.assertTrue('DICOMDIR' in z.namelist()) | |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5103 |
|
354
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5104 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
|
5105 self.assertEqual(2, info['Content']['InstancesCount']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5106 self.assertEqual(0, info['Content']['UncompressedSizeMB']) |
|
88f076b906ca
test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
5107 |
| 187 | 5108 |
|
540
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5109 def test_archive_job_delete_output(self): |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5110 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1): |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5111 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5112 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5113 |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5114 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5115 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5116 |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5117 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5118 (_REMOTE, '/series/%s/archive' % kneeT1, { |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5119 'Synchronous' : False |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5120 })) |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5121 |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5122 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5123 # delete the output |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5124 DoDelete(_REMOTE, '/jobs/%s/archive' % job) |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5125 # make sure it is not available anymore afterwards |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5126 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job)) |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5127 |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5128 # repeat with another resource/job |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5129 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5130 (_REMOTE, '/series/%s/archive' % kneeT2, { |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5131 'Synchronous' : False |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5132 })) |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5133 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5134 # delete the output |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5135 DoDelete(_REMOTE, '/jobs/%s/archive' % job) |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5136 # make sure it is not available anymore afterwards |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5137 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job)) |
| 572 | 5138 # job is still available |
| 5139 DoGet(_REMOTE, '/jobs/%s' % job) | |
| 5140 | |
| 5141 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2): | |
| 5142 # delete the job itself | |
| 5143 DoDelete(_REMOTE, '/jobs/%s' % job) | |
| 5144 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/jobs/%s' % job)) | |
| 5145 | |
| 5146 # test deletion of jobs in history | |
| 5147 job = MonitorJob2(_REMOTE, lambda: DoPost | |
| 5148 (_REMOTE, '/series/%s/archive' % kneeT2, { | |
| 5149 'Synchronous' : False | |
| 5150 })) | |
| 5151 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) | |
| 5152 # delete the job itself | |
| 5153 DoDelete(_REMOTE, '/jobs/%s' % job) | |
| 5154 # make sure it is not available anymore afterwards (and its output is not available either) | |
| 5155 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/jobs/%s' % job)) | |
| 5156 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job)) | |
|
540
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5157 |
|
ea1003982c27
added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents:
538
diff
changeset
|
5158 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5159 def test_queries_hierarchy(self): |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5160 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5161 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
|
5162 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5163 tags = { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5164 'NumberOfPatientRelatedInstances' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5165 'NumberOfPatientRelatedSeries' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5166 'NumberOfPatientRelatedStudies' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5167 'NumberOfStudyRelatedInstances' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5168 'NumberOfStudyRelatedSeries' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5169 'NumberOfSeriesRelatedInstances' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5170 } |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5171 |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5172 tags2 = copy.copy(tags) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5173 tags2['PatientID'] = '887' # Only consider the "Knee" patient |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5174 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5175 patient = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5176 'Level' : 'Patient', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5177 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5178 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5179 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5180 study = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5181 'Level' : 'Study', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5182 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5183 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5184 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5185 series = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5186 'Level' : 'Series', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5187 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5188 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5189 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5190 instance = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5191 'Level' : 'Instance', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5192 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5193 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5194 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5195 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
|
5196 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5197 self.assertEqual('887', p[0]['PatientID']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5198 self.assertEqual('1', p[0]['NumberOfPatientRelatedInstances']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5199 self.assertEqual('1', p[0]['NumberOfPatientRelatedSeries']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5200 self.assertEqual('1', p[0]['NumberOfPatientRelatedStudies']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5201 self.assertFalse('NumberOfStudyRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5202 self.assertFalse('NumberOfStudyRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5203 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5204 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5205 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
|
5206 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5207 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
|
5208 self.assertEqual('1', p[0]['NumberOfStudyRelatedInstances']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5209 self.assertEqual('1', p[0]['NumberOfStudyRelatedSeries']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5210 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5211 self.assertFalse('NumberOfPatientRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5212 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5213 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5214 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5215 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
|
5216 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5217 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
|
5218 self.assertEqual('1', p[0]['NumberOfSeriesRelatedInstances']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5219 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5220 self.assertFalse('NumberOfPatientRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5221 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5222 self.assertFalse('NumberOfStudyRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5223 self.assertFalse('NumberOfStudyRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5224 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5225 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
|
5226 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5227 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
|
5228 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5229 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
|
5230 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5231 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
|
5232 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % study)) |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5233 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5234 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
|
5235 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5236 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
|
5237 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5238 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5239 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
|
5240 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5241 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
|
5242 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5243 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5244 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
|
5245 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5246 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
|
5247 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5248 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5249 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
|
5250 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5251 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
|
5252 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5253 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5254 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
|
5255 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5256 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
|
5257 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5258 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
5259 |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5260 def test_dicom_disk_size(self): |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5261 dicomSize = 0 |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5262 |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
5263 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
|
5264 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
|
5265 |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5266 for i in range(2): |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5267 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
|
5268 UploadInstance(_REMOTE, p) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5269 dicomSize += os.path.getsize(GetDatabasePath(p)) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5270 |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5271 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
|
5272 self.assertEqual(2, s['CountInstances']) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5273 self.assertEqual(2, s['CountSeries']) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5274 self.assertEqual(1, s['CountStudies']) |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
5275 |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
5276 self.assertEqual(dicomSize, int(s['DicomUncompressedSize'])) |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
5277 |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
5278 if isCompressed: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
5279 self.assertGreater(dicomSize, int(s['DicomDiskSize'])) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
5280 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
|
5281 self.assertLess(dicomSize, int(s['UncompressedSize'])) |
|
379
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
5282 else: |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
5283 self.assertEqual(dicomSize, int(s['DicomDiskSize'])) |
|
097329b67509
fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
378
diff
changeset
|
5284 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
|
5285 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
|
5286 if IsDicomUntilPixelDataStored(_REMOTE): |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
5287 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
|
5288 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
5289 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
|
5290 else: |
|
b9adc7d06347
update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
379
diff
changeset
|
5291 # 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
|
5292 # 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
|
5293 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
|
5294 |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5295 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5296 def test_changes_2(self): |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5297 # 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
|
5298 # 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
|
5299 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5300 # 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
|
5301 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
|
5302 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
|
5303 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
|
5304 DoDelete(_REMOTE, '/instances/%s' % a) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5305 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5306 # 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
|
5307 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
|
5308 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5309 c = DoGet(_REMOTE, '/changes') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5310 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
|
5311 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5312 seq = c['Last'] |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5313 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5314 c = DoGet(_REMOTE, '/changes?last') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5315 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
|
5316 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5317 self.assertEqual(seq, c['Last']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5318 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5319 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
|
5320 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
|
5321 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5322 self.assertEqual(seq, c['Last']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5323 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5324 # Add one instance |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5325 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5326 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
|
5327 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5328 c = DoGet(_REMOTE, '/changes') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5329 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
|
5330 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5331 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
|
5332 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5333 c = DoGet(_REMOTE, '/changes?last') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5334 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
|
5335 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5336 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
|
5337 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5338 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
|
5339 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
|
5340 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5341 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
|
5342 |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5343 # 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
|
5344 # changes of type "UpdatedMetadata" |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5345 i = DoGet(_REMOTE, '/instances') [0] |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5346 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
|
5347 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
5348 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/4000' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
5349 self.assertEqual('200', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
5350 self.assertEqual('hello', body) |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5351 |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5352 c = DoGet(_REMOTE, '/changes?last') |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5353 self.assertEqual(1, len(c['Changes'])) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5354 self.assertTrue(c['Done']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5355 self.assertEqual(seq + 5, c['Last']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5356 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5357 |
|
394
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
5358 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2): |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
5359 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i, headers = { |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
5360 'If-Match' : headers['etag'] |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
5361 }) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
5362 else: |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
5363 self.assertFalse('etag' in headers) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
5364 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i) |
|
e87d54a8a204
compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
393
diff
changeset
|
5365 |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5366 c = DoGet(_REMOTE, '/changes?last') |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5367 self.assertEqual(1, len(c['Changes'])) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5368 self.assertTrue(c['Done']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5369 self.assertEqual(seq + 6, c['Last']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5370 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType']) |
|
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5371 |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5372 # Remove the uploaded instance |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5373 DoDelete(_REMOTE, '/instances/%s' % a) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5374 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
|
5375 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5376 c = DoGet(_REMOTE, '/changes') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5377 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
|
5378 self.assertTrue(c['Done']) |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5379 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
|
5380 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5381 c = DoGet(_REMOTE, '/changes?last') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5382 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
|
5383 self.assertTrue(c['Done']) |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5384 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
|
5385 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5386 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
|
5387 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
|
5388 self.assertTrue(c['Done']) |
|
389
27e0a2fcdc85
test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
384
diff
changeset
|
5389 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
|
5390 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5391 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
5392 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
|
5393 a = UploadInstance(_REMOTE, 'Issue124.dcm')['ID'] |
| 508 | 5394 s = DoGet(_REMOTE, '/instances/%s/series' % a)['ID'] |
| 5395 | |
| 5396 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
|
5397 self.assertEqual(2, len(z.namelist())) |
|
207
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
5398 |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
5399 |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
5400 def test_invalid_findscp(self): |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
5401 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
5402 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
|
5403 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
|
5404 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5405 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5406 def test_bitbucket_issue_90(self): |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5407 def CountDicomResults(sex): |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5408 a = CallFindScu([ '-S', '-k', '8,52=STUDY', '-k', sex ]) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5409 return len(re.findall('\(0010,0040\)', a)) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5410 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5411 def CountRestResults(sex): |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5412 a = DoPost(_REMOTE, '/tools/find', |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5413 { 'Level' : 'Study', 'Query' : { 'PatientSex' : sex } }) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5414 return len(a) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5415 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5416 # 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
|
5417 # "DummyCT.dcm" has the tag PatientSex (0010,0040) unset |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5418 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5419 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5420 # 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
|
5421 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5422 # 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
|
5423 self.assertEqual(0, CountDicomResults('PatientSex=*')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5424 self.assertEqual(0, CountRestResults('*')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5425 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5426 # 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
|
5427 self.assertEqual(0, CountDicomResults('PatientSex=F')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5428 self.assertEqual(0, CountDicomResults('PatientSex=M')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5429 self.assertEqual(0, CountRestResults('F')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5430 self.assertEqual(0, CountRestResults('M')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5431 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5432 # 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
|
5433 # 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
|
5434 # as a filter in such a situation. |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5435 self.assertEqual(1, CountDicomResults('PatientSex')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5436 self.assertEqual(1, CountDicomResults('PatientSex=')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
5437 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
|
5438 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5439 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5440 def test_rest_modalities_in_study(self): |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5441 # 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
|
5442 # 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
|
5443 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5444 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5445 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5446 'Query' : { 'ModalitiesInStudy' : 'US' }}) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5447 self.assertEqual(0, len(a)) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5448 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5449 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5450 'Query' : { 'ModalitiesInStudy' : 'US\\CT' }}) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5451 self.assertEqual(1, len(a)) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5452 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5453 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5454 'Query' : { 'ModalitiesInStudy' : 'CT' }}) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
5455 self.assertEqual(1, len(a)) |
| 211 | 5456 |
| 5457 | |
| 5458 def test_series_status(self): | |
| 5459 def HasCompletedInChanges(): | |
| 5460 for c in DoGet(_REMOTE, '/changes?limit=1000&since=0')['Changes']: | |
| 5461 if c['ChangeType'] == 'CompletedSeries': | |
| 5462 return True; | |
| 5463 | |
| 5464 return False | |
| 5465 | |
| 5466 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm') | |
| 5467 series = '8ea120d7-5057d919-837dfbcc-ccd04e0f-7f3a94aa' | |
| 5468 self.assertEqual('Unknown', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 5469 self.assertFalse(HasCompletedInChanges()) | |
| 5470 | |
| 5471 series = 'ce25ecb6-ed79d004-5ae43ca7-3fc89bc5-67511614' | |
| 5472 | |
| 5473 for i in range(3): | |
| 5474 UploadInstance(_REMOTE, 'Series/Lena-%d.dcm' % (i + 1)) | |
| 5475 self.assertEqual('Missing', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 5476 self.assertFalse(HasCompletedInChanges()) | |
| 5477 | |
| 5478 UploadInstance(_REMOTE, 'Series/Lena-4.dcm') | |
| 5479 self.assertEqual('Complete', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 5480 self.assertTrue(HasCompletedInChanges()) | |
| 5481 | |
| 5482 DoDelete(_REMOTE, '/changes') | |
| 5483 self.assertFalse(HasCompletedInChanges()) | |
| 5484 | |
| 5485 UploadInstance(_REMOTE, 'Series/Lena-5.dcm') | |
| 5486 self.assertEqual('Inconsistent', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 5487 self.assertFalse(HasCompletedInChanges()) | |
| 5488 | |
| 215 | 5489 |
| 5490 def test_dicomweb(self): | |
|
698
7282c2df963d
tests for new DICOMWeb JSON DS handling
Alain Mazy <am@orthanc.team>
parents:
697
diff
changeset
|
5491 if IsOrthancVersionAbove(_LOCAL, 1, 12, 5) and DoGet(_REMOTE, '/system')['ApiVersion'] >= 26: # the references have changed with 1.12.5 -> we don't want to keep 2 references |
|
7282c2df963d
tests for new DICOMWeb JSON DS handling
Alain Mazy <am@orthanc.team>
parents:
697
diff
changeset
|
5492 def Compare(dicom, reference): |
|
7282c2df963d
tests for new DICOMWeb JSON DS handling
Alain Mazy <am@orthanc.team>
parents:
697
diff
changeset
|
5493 a = UploadInstance(_REMOTE, dicom) ['ID'] |
|
7282c2df963d
tests for new DICOMWeb JSON DS handling
Alain Mazy <am@orthanc.team>
parents:
697
diff
changeset
|
5494 b = DoGet(_REMOTE, '/instances/%s/file' % a, |
|
7282c2df963d
tests for new DICOMWeb JSON DS handling
Alain Mazy <am@orthanc.team>
parents:
697
diff
changeset
|
5495 headers = { 'Accept' : 'application/dicom+json' }) |
|
7282c2df963d
tests for new DICOMWeb JSON DS handling
Alain Mazy <am@orthanc.team>
parents:
697
diff
changeset
|
5496 with open(GetDatabasePath(reference), 'rb') as c: |
|
7282c2df963d
tests for new DICOMWeb JSON DS handling
Alain Mazy <am@orthanc.team>
parents:
697
diff
changeset
|
5497 d = json.load(c) |
|
7282c2df963d
tests for new DICOMWeb JSON DS handling
Alain Mazy <am@orthanc.team>
parents:
697
diff
changeset
|
5498 AssertAlmostEqualRecursive(self, d, b) |
|
7282c2df963d
tests for new DICOMWeb JSON DS handling
Alain Mazy <am@orthanc.team>
parents:
697
diff
changeset
|
5499 |
|
7282c2df963d
tests for new DICOMWeb JSON DS handling
Alain Mazy <am@orthanc.team>
parents:
697
diff
changeset
|
5500 Compare('DummyCT.dcm', 'DummyCT.json') |
|
7282c2df963d
tests for new DICOMWeb JSON DS handling
Alain Mazy <am@orthanc.team>
parents:
697
diff
changeset
|
5501 Compare('MarekLatin2.dcm', 'MarekLatin2.json') |
|
7282c2df963d
tests for new DICOMWeb JSON DS handling
Alain Mazy <am@orthanc.team>
parents:
697
diff
changeset
|
5502 Compare('HierarchicalAnonymization/StructuredReports/IM0', |
|
7282c2df963d
tests for new DICOMWeb JSON DS handling
Alain Mazy <am@orthanc.team>
parents:
697
diff
changeset
|
5503 'HierarchicalAnonymization/StructuredReports/IM0.json') |
| 217 | 5504 |
| 5505 | |
| 5506 def test_issue_95_encodings(self): | |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
5507 # https://bugs.orthanc-server.com/show_bug.cgi?id=95 |
| 217 | 5508 # Check out image: "../Database/Encodings/DavidClunie/charsettests.screenshot.png" |
| 5509 | |
| 5510 # Very useful tool: "file2" from package "file-kanji" | |
| 5511 | |
| 5512 def GetPatientName(dicom): | |
| 5513 i = UploadInstance(_REMOTE, dicom) ['ID'] | |
| 5514 j = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) | |
| 5515 return j['PatientName'] | |
| 5516 | |
| 5517 def ComparePatientName(name, dicom): | |
| 5518 self.assertEqual(name, GetPatientName(dicom)) | |
| 5519 | |
| 5520 # gdcmraw -t 10,10 -i SCSFREN -o /tmp/tag && uconv -f ISO-IR-100 -t UTF-8 /tmp/tag && echo | |
| 5521 ComparePatientName(u'Buc^Jérôme', 'Encodings/DavidClunie/SCSFREN') | |
| 5522 | |
| 5523 # gdcmraw -t 10,10 -i SCSI2 -o /tmp/tag && uconv -f KOREAN -t UTF-8 /tmp/tag && echo | |
| 5524 ComparePatientName(u'Hong^Gildong=洪^吉洞=홍^길동', 'Encodings/DavidClunie/SCSI2') # Since Orthanc 1.5.5 | |
| 5525 | |
| 5526 # gdcmraw -t 10,10 -i SCSX2 -o /tmp/tag && uconv -f GB18030 -t UTF-8 /tmp/tag && echo | |
| 5527 ComparePatientName(u'Wang^XiaoDong=王^小东=', 'Encodings/DavidClunie/SCSX2') | |
| 5528 | |
| 5529 # gdcmraw -t 10,10 -i SCSX1 -o /tmp/tag && cat /tmp/tag && echo | |
| 5530 ComparePatientName(u'Wang^XiaoDong=王^小東=', 'Encodings/DavidClunie/SCSX1') | |
| 5531 | |
| 5532 # gdcmraw -t 10,10 -i SCSH31 -o /tmp/tag && uconv -f JIS -t UTF-8 /tmp/tag && echo | |
| 5533 ComparePatientName(u'Yamada^Tarou=山田^太郎=やまだ^たろう', 'Encodings/DavidClunie/SCSH31') | |
| 5534 | |
| 5535 # gdcmraw -t 10,10 -i SCSGERM -o /tmp/tag && uconv -f ISO-IR-100 -t UTF-8 /tmp/tag && echo | |
| 5536 ComparePatientName(u'Äneas^Rüdiger', 'Encodings/DavidClunie/SCSGERM') | |
| 5537 | |
| 5538 # gdcmraw -t 10,10 -i SCSGREEK -o /tmp/tag && uconv -f ISO-IR-126 -t UTF-8 /tmp/tag && echo | |
| 5539 ComparePatientName(u'Διονυσιος', 'Encodings/DavidClunie/SCSGREEK') | |
| 5540 | |
| 5541 # gdcmraw -t 10,10 -i SCSRUSS -o /tmp/tag && uconv -f ISO-IR-144 -t UTF-8 /tmp/tag && echo | |
| 5542 ComparePatientName(u'Люкceмбypг', 'Encodings/DavidClunie/SCSRUSS') | |
| 5543 | |
| 5544 # gdcmraw -t 10,10 -i SCSHBRW -o /tmp/tag && uconv -f ISO-IR-138 -t UTF-8 /tmp/tag && echo | |
| 5545 # NB: Hebrew is a right-to-left encoding, copying/pasting from | |
| 5546 # Linux console into Emacs automatically reverse the string | |
| 5547 ComparePatientName(u'שרון^דבורה', 'Encodings/DavidClunie/SCSHBRW') | |
| 5548 | |
| 5549 # gdcmraw -t 10,10 -i SCSARAB -o /tmp/tag && uconv -f ISO-IR-127 -t UTF-8 /tmp/tag && echo | |
| 5550 # NB: Right-to-left as for Hebrew (SCSHBRW), and the Ubuntu console can't display such | |
| 5551 # characters by default, but copy/paste works with Emacs | |
| 5552 ComparePatientName(u'قباني^لنزار', 'Encodings/DavidClunie/SCSARAB') | |
| 5553 | |
| 5554 # SCSH32: This SpecificCharacterSet is composed of 2 | |
| 5555 # codepages: "ISO 2022 IR 13" (i.e. "SHIFT_JIS") until the | |
| 5556 # first equal, then "ISO 2022 IR 87" (i.e. "JIS") for the | |
| 5557 # remainer. Orthanc only takes into consideration the first | |
| 5558 # codepage: This is a limitation. | |
| 5559 # gdcmraw -t 10,10 -i SCSH32 -o /tmp/tag && cut -d '=' -f 1 /tmp/tag | uconv -f SHIFT_JIS -t UTF-8 | |
| 5560 self.assertTrue(GetPatientName('Encodings/DavidClunie/SCSH32').startswith(u'ﾔﾏﾀﾞ^ﾀﾛｳ=')) | |
|
218
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5561 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5562 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5563 def test_findscu_missing_tags(self): |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5564 # dcmodify -e Rows DummyCTInvalidRows.dcm -gst -gse -gin |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5565 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5566 UploadInstance(_REMOTE, 'DummyCTInvalidRows.dcm') |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5567 |
| 669 | 5568 i = CallFindScu([ '-k', '0008,0052=IMAGES', '-k', 'PatientName', '-k', 'Rows', '-k', 'Columns' ]) |
|
218
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5569 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5570 # We have 2 instances... |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5571 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5572 self.assertEqual(2, len(patientNames)) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5573 self.assertEqual('KNIX', patientNames[0]) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5574 self.assertEqual('KNIX', patientNames[1]) |
| 669 | 5575 |
| 5576 columns = re.findall('\(0028,0011\) US ([0-9]+)', i) | |
| 5577 self.assertEqual(2, len(columns)) | |
| 5578 self.assertEqual('512', columns[0]) | |
| 5579 self.assertEqual('512', columns[1]) | |
|
218
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5580 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5581 # ...but only 1 value for the "Rows" tag |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5582 rows = re.findall('\(0028,0010\) US ([0-9]+)', i) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5583 self.assertEqual(1, len(rows)) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
5584 self.assertEqual('512', rows[0]) |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5585 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5586 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5587 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5588 def test_bitbucket_issue_131(self): |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5589 # "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
|
5590 # StudyInstanceUID in it's database." |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
5591 # 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
|
5592 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5593 # Insert 2 instances, with the same StudyInstanceUID, but with |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5594 # different patient IDs. Orthanc will create 2 distincts |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5595 # patients, and the hierarchy of resources above the two |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5596 # instances will be fully disjoint. |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5597 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-a.dcm') |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5598 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-b.dcm') |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5599 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5600 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5601 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5602 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5603 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5604 'Level' : 'Study', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5605 'Query' : {"PatientID": "A" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5606 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5607 # 1 study is matched |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5608 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
|
5609 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5610 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 5611 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 5612 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 5613 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5614 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5615 # 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
|
5616 # 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
|
5617 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5618 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5619 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5620 # Match the 2 studies |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5621 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5622 'Level' : 'Study', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5623 'Query' : {"StudyInstanceUID": "2.25.123" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5624 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
|
5625 DropOrthanc(_LOCAL) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5626 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 5627 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 5628 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 5629 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5630 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5631 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5632 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5633 # 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
|
5634 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5635 'Level' : 'Patient', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5636 'Query' : {"PatientID": "A" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5637 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
|
5638 DropOrthanc(_LOCAL) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5639 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 5640 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 5641 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 5642 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5643 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5644 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5645 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5646 # 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
|
5647 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5648 'Level' : 'Series', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5649 'Query' : {"PatientID": "A" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5650 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
|
5651 DropOrthanc(_LOCAL) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5652 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 5653 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 5654 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 5655 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5656 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
5657 |
|
233
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5658 |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5659 def test_bitbucket_issue_136(self): |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5660 UploadInstance(_REMOTE, 'Issue137.dcm') |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5661 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
|
5662 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5663 self.assertEqual(1, len(patientNames)) |
|
ce0b19a2c807
test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
5664 self.assertEqual('John Doe', patientNames[0]) |
|
234
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5665 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5666 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5667 def test_anonymize_relationships_4(self): |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5668 # 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
|
5669 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
|
5670 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
|
5671 study = '0c923249-d52121a9-2b7167f7-6b85534f-0943697e' |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5672 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5673 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, '{}', |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5674 'application/json')['ID'] |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5675 series = DoGet(_REMOTE, '/studies/%s/series' % anonymized) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5676 self.assertEqual(2, len(series)) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5677 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5678 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
|
5679 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
|
5680 self.assertEqual(1, len(cr)) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5681 self.assertEqual(1, len(pr)) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5682 self.assertEqual(1, len(cr[0]['Instances'])) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5683 self.assertEqual(1, len(pr[0]['Instances'])) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5684 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5685 crinstance = DoGet(_REMOTE, '/instances/%s' % cr[0]['Instances'][0]) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5686 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
|
5687 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5688 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
|
5689 crinstance['MainDicomTags']['SOPInstanceUID']) |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5690 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
|
5691 '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
|
5692 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5693 # This fails on Orthanc <= 1.5.6 |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5694 self.assertEqual(tags['0008,1115'][0]['0020,000e'], |
|
93cd4fdd4a67
test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
5695 cr[0]['MainDicomTags']['SeriesInstanceUID']) |
|
235
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5696 |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5697 |
|
255
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5698 def test_anonymize_relationships_5(self): |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5699 ct1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/CT01.dcm') |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5700 rt1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/RT.dcm') |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5701 oStudyId = ct1['ParentStudy'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5702 oCtInstanceId = ct1['ID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5703 oRtInstanceId = rt1['ID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5704 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5705 oCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oCtInstanceId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5706 oRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oRtInstanceId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5707 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5708 # first validate the relationships in the source data |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5709 oStudyUID = oCtTags['StudyInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5710 oRtSeriesUID = oRtTags['SeriesInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5711 oRtInstanceUID = oRtTags['SOPInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5712 oRtFrameOfReferenceUID = oRtTags['ReferencedFrameOfReferenceSequence'][0]['FrameOfReferenceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5713 oCtSeriesUID = oCtTags['SeriesInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5714 oCtInstanceUID = oCtTags['SOPInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5715 oCtFrameOfReferenceUID = oCtTags['FrameOfReferenceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5716 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5717 oContourSequenceCount = len(oRtTags['ROIContourSequence'][0]['ContourSequence']) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5718 self.assertEqual(oCtFrameOfReferenceUID, oRtFrameOfReferenceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5719 self.assertEqual(oStudyUID, oRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID']) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5720 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
|
5721 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
|
5722 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
|
5723 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5724 ### anonymize |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5725 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5726 aStudyId = DoPost(_REMOTE, '/studies/%s/anonymize' % oStudyId, '{}', |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5727 'application/json')['ID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5728 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5729 ### validate |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5730 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5731 aSeries = DoGet(_REMOTE, '/studies/%s/series' % aStudyId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5732 self.assertEqual(2, len(aSeries)) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5733 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5734 aCt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CT', aSeries)) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5735 aRt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'RTSTRUCT', aSeries)) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5736 aCtInstanceId = aCt[0]['Instances'][0] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5737 aRtInstanceId = aRt[0]['Instances'][0] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5738 aCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aCtInstanceId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5739 aRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aRtInstanceId) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5740 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5741 # now validate the relationships in the anonymized data |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5742 aStudyUID = aCtTags['StudyInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5743 aRtSeriesUID = aRtTags['SeriesInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5744 aRtInstanceUID = aRtTags['SOPInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5745 aRtFrameOfReferenceUID = aRtTags['ReferencedFrameOfReferenceSequence'][0]['FrameOfReferenceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5746 aCtSeriesUID = aCtTags['SeriesInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5747 aCtInstanceUID = aCtTags['SOPInstanceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5748 aCtFrameOfReferenceUID = aCtTags['FrameOfReferenceUID'] |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5749 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5750 aContourSequenceCount = len(aRtTags['ROIContourSequence'][0]['ContourSequence']) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5751 # make sure all UIDs have been updated |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5752 self.assertNotEqual(oStudyUID, aStudyUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5753 self.assertNotEqual(oRtSeriesUID, aRtSeriesUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5754 self.assertNotEqual(oRtInstanceUID, aRtInstanceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5755 self.assertNotEqual(oRtFrameOfReferenceUID, aRtFrameOfReferenceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5756 self.assertNotEqual(oCtSeriesUID, aCtSeriesUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5757 self.assertNotEqual(oCtInstanceUID, aCtInstanceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5758 self.assertNotEqual(oCtFrameOfReferenceUID, aCtFrameOfReferenceUID) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5759 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5760 # validate the relationships |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5761 self.assertEqual(oContourSequenceCount, aContourSequenceCount) |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5762 self.assertEqual(aCtFrameOfReferenceUID, aRtFrameOfReferenceUID) |
| 256 | 5763 self.assertEqual(aStudyUID, aRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID']) |
| 5764 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
|
5765 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
|
5766 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
|
5767 |
| 256 | 5768 def test_anonymize_relationships_5b(self): |
| 5769 # same test as previous one but, this time, we force the StudyInstanceUID | |
| 5770 ct1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/CT01.dcm') | |
| 5771 rt1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/RT.dcm') | |
| 5772 oStudyId = ct1['ParentStudy'] | |
| 5773 oCtInstanceId = ct1['ID'] | |
| 5774 oRtInstanceId = rt1['ID'] | |
| 5775 | |
| 5776 oCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oCtInstanceId) | |
| 5777 oRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oRtInstanceId) | |
| 5778 | |
| 5779 ### anonymize while forcing the StudyInstanceUID | |
| 5780 | |
| 5781 aStudyId = DoPost(_REMOTE, '/studies/%s/anonymize' % oStudyId, '{ "Replace" : { "StudyInstanceUID" : "1.2.3.4"}, "Force": true}', | |
| 5782 'application/json')['ID'] | |
| 5783 | |
| 5784 ### validate | |
| 5785 | |
| 5786 aSeries = DoGet(_REMOTE, '/studies/%s/series' % aStudyId) | |
| 5787 self.assertEqual(2, len(aSeries)) | |
| 5788 | |
| 5789 aCt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CT', aSeries)) | |
| 5790 aRt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'RTSTRUCT', aSeries)) | |
| 5791 aCtInstanceId = aCt[0]['Instances'][0] | |
| 5792 aRtInstanceId = aRt[0]['Instances'][0] | |
| 5793 aCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aCtInstanceId) | |
| 5794 aRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aRtInstanceId) | |
| 5795 | |
| 5796 self.assertEqual("1.2.3.4", aCtTags['StudyInstanceUID']) | |
| 5797 self.assertEqual("1.2.3.4", aRtTags['StudyInstanceUID']) | |
| 5798 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
|
5799 |
|
02c3d91b155c
added anonymization test for RTH data (currently failing)
amazy
parents:
254
diff
changeset
|
5800 |
|
235
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5801 def test_bitbucket_issue_140(self): |
| 266 | 5802 # "Modifying private tags with REST API changes VR from LO to |
| 267 | 5803 # UN." This test fails if DCMTK <= 3.6.1 (e.g. fails on Ubuntu 16.04). |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
5804 # 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
|
5805 source = UploadInstance(_REMOTE, 'Issue140.dcm') ['ID'] |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5806 series = DoGet(_REMOTE, '/instances/%s' % source) ['ParentSeries'] |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5807 |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5808 target = DoPost(_REMOTE, '/series/%s/modify' % series, { |
| 266 | 5809 'Replace' : { 'RadioButton3' : 'aaabbbccc' }, |
| 5810 'PrivateCreator' : 'RadioLogic', # <= the trick is here | |
|
235
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5811 }, 'application/json') ['ID'] |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5812 |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5813 instances = DoGet(_REMOTE, '/series/%s/instances' % target) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5814 self.assertEqual(1, len(instances)) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5815 |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5816 tags = DoGet(_REMOTE, '/instances/%s/tags' % source) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5817 t = tags['4321,1012'] |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5818 self.assertEqual('String', t['Type']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5819 self.assertEqual('RadioButton3', t['Name']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5820 self.assertEqual('RadioLogic', t['PrivateCreator']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5821 self.assertEqual('jklmopq', t['Value']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5822 |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5823 tags = DoGet(_REMOTE, '/instances/%s/tags' % instances[0]['ID']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5824 t = tags['4321,1012'] |
| 327 | 5825 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
|
5826 self.assertEqual('RadioButton3', t['Name']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5827 self.assertEqual('RadioLogic', t['PrivateCreator']) |
|
9929e4af2b7a
test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
234
diff
changeset
|
5828 self.assertEqual('aaabbbccc', t['Value']) |
|
236
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5829 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5830 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5831 def test_find_normalize(self): |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5832 # https://groups.google.com/d/msg/orthanc-users/AIwooGjsh94/YL28MNY4AgAJ |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5833 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5834 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5835 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5836 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5837 'Level' : 'Instance', |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5838 'Query' : { 'Rows' : '42' } |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5839 }) ['ID'] |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5840 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5841 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5842 self.assertEqual(1, len(b)) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5843 self.assertFalse('Rows' in b[0]) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5844 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5845 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5846 'Level' : 'Instance', |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5847 'Query' : { 'Rows' : '42' }, |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5848 'Normalize' : False |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5849 }) ['ID'] |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5850 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5851 b = DoGet(_REMOTE, '/queries/%s/answers' % a) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5852 self.assertEqual(0, len(b)) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5853 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5854 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5855 'Level' : 'Instance', |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5856 'Query' : { 'Rows' : '512' }, |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5857 'Normalize' : False |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5858 }) ['ID'] |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5859 |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5860 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5861 self.assertEqual(1, len(b)) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5862 self.assertTrue('Rows' in b[0]) |
|
2de1aec255ae
test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
5863 self.assertEqual('512', b[0]['Rows']) |
| 237 | 5864 |
| 5865 a = DoPost(_REMOTE, '/modalities/self/query', { | |
| 5866 'Level' : 'Instance', | |
| 5867 'Query' : { 'Rows' : '' }, | |
| 5868 'Normalize' : False | |
| 5869 }) ['ID'] | |
| 5870 | |
| 5871 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) | |
| 5872 self.assertEqual(1, len(b)) | |
| 5873 self.assertTrue('Rows' in b[0]) | |
| 5874 self.assertEqual('512', b[0]['Rows']) | |
| 5875 | |
| 5876 self.assertRaises(Exception, lambda: DoPost( | |
| 5877 _REMOTE, '/modalities/self/query', { | |
| 5878 'Level' : 'Instance', | |
| 5879 'Query' : { 'Rows' : '*' }, # Out-of-range value | |
| 5880 'Normalize' : False | |
| 5881 })) | |
|
243
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5882 |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5883 |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5884 def test_bitbucket_issue_141(self): |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
5885 # 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
|
5886 a = UploadInstance(_REMOTE, 'Issue141.dcm') ['ID'] |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5887 study = '494c8037-b237f263-d8f15075-c8cb2280-daf39bd1' |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5888 |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5889 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f: |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5890 pdf = f.read() |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5891 |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5892 b = DoPost(_REMOTE, '/tools/create-dicom', { |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5893 'Parent' : study, |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5894 'Tags' : {}, |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5895 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5896 }) ['ID'] |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5897 |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5898 tagsA = DoGet(_REMOTE, '/instances/%s/tags?short' % a) |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5899 tagsB = DoGet(_REMOTE, '/instances/%s/tags?short' % b) |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5900 self.assertEqual(tagsA['0008,0005'], tagsB['0008,0005']) |
|
cccf697a4e13
test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
237
diff
changeset
|
5901 self.assertEqual(tagsA['0008,1030'], tagsB['0008,1030']) |
|
247
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5902 |
|
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5903 |
|
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5904 def test_modifying_missing_patientid(self): |
|
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5905 # 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
|
5906 UploadInstance(_REMOTE, '2019-06-17-VedranZdesic.dcm') |
|
1abdab0ba0e6
test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
243
diff
changeset
|
5907 DoPost(_REMOTE, '/studies/0c4aca1d-c107a241-6659d6aa-594c674a-a468b94a/modify', {}) |
| 262 | 5908 |
| 5909 | |
| 5910 def test_log_level(self): | |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
5911 # https://bugs.orthanc-server.com/show_bug.cgi?id=65 |
| 262 | 5912 original = DoGet(_REMOTE, '/tools/log-level') |
| 5913 | |
| 5914 DoPut(_REMOTE, '/tools/log-level', 'default') | |
| 5915 self.assertEqual('default', DoGet(_REMOTE, '/tools/log-level')) | |
| 5916 DoGet(_REMOTE, '/system') | |
| 5917 | |
| 5918 DoPut(_REMOTE, '/tools/log-level', 'verbose') | |
| 5919 self.assertEqual('verbose', DoGet(_REMOTE, '/tools/log-level')) | |
| 5920 DoGet(_REMOTE, '/system') | |
| 5921 | |
| 5922 DoPut(_REMOTE, '/tools/log-level', 'trace') | |
| 5923 self.assertEqual('trace', DoGet(_REMOTE, '/tools/log-level')) | |
| 5924 DoGet(_REMOTE, '/system') | |
| 5925 | |
| 5926 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/log-level', 'nope')) | |
| 5927 | |
| 5928 # Switch back to the original log level | |
| 5929 DoPut(_REMOTE, '/tools/log-level', original) | |
|
264
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5930 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5931 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5932 def test_upload_compressed(self): |
| 265 | 5933 # New in Orthanc 1.6.0 |
|
264
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5934 with open(GetDatabasePath('DummyCT.dcm.gz'), 'rb') as f: |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5935 d = f.read() |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5936 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5937 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances', d, 'application/dicom')) |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5938 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5939 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances', d, 'application/dicom', |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5940 headers = { 'Content-Encoding' : 'nope' })) |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5941 |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5942 a = DoPost(_REMOTE, '/instances', d, 'application/dicom', |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5943 headers = { 'Content-Encoding' : 'gzip' }) |
|
445f498bc1d4
test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
263
diff
changeset
|
5944 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a['ID']) |
| 262 | 5945 |
| 5946 | |
|
263
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5947 def test_study_series_find_inconsistency(self): |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5948 # 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
|
5949 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5950 def CountAnswers(query): |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5951 a = DoPost(_REMOTE, 'modalities/self/query', query) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5952 return len(DoGet(_REMOTE, '%s/answers' % a['Path'])) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5953 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5954 # 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
|
5955 # "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
|
5956 # the "main DICOM tags" of Orthanc. |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5957 UploadInstance(_REMOTE, 'Issue137.dcm') |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5958 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5959 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5960 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5961 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5962 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5963 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5964 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5965 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5966 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5967 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5968 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5969 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5970 ## "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
|
5971 ## 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
|
5972 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5973 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5974 # 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
|
5975 # is wiped out by the normalization |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5976 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5977 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5978 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5979 'SeriesDescription' : 'NOPE' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5980 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5981 'Normalize' : False |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5982 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5983 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5984 # This test fails on Orthanc <= 1.5.8 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5985 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5986 'Query' : { |
| 669 | 5987 'ImageComments' : '*' # Wildcard matching => no match, as the tag is absent |
| 5988 }, | |
| 5989 'Normalize' : False | |
| 5990 })) | |
| 5991 self.assertEqual(1, CountAnswers({ | |
| 5992 'Level' : 'Study', | |
| 5993 'Query' : { | |
| 5994 'ImageComments' : '' | |
|
263
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5995 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5996 'Normalize' : False |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5997 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5998 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
5999 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6000 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6001 'SeriesDescription' : 'THIS^VALUE^IS^WIPED^OUT' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6002 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6003 'Normalize' : True |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6004 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6005 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6006 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6007 'Query' : { |
| 669 | 6008 'ImageComments' : '*' # Matches, as wiped out by the normalization |
| 6009 }, | |
| 6010 'Normalize' : True | |
| 6011 })) | |
| 6012 self.assertEqual(1, CountAnswers({ | |
| 6013 'Level' : 'Study', | |
| 6014 'Query' : { | |
| 6015 'ImageComments' : '' | |
|
263
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6016 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6017 'Normalize' : True |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6018 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6019 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6020 for normalize in [ True, False ]: |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6021 # 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
|
6022 # normalization has no effect |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6023 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6024 # "Universal matching" will match all entities, including |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6025 # those with the missing tag |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6026 # 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
|
6027 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6028 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6029 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6030 'SeriesDescription' : '' # Universal matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6031 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6032 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6033 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6034 # "Universal matching" will match all entities, including |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6035 # those with the missing tag |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6036 # 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
|
6037 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6038 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6039 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6040 'SeriesDescription' : '*' # Wildcard matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6041 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6042 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6043 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6044 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6045 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6046 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6047 '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
|
6048 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6049 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6050 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6051 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6052 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6053 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6054 'SeriesDescription' : '*MISMATCHED^VALUE*' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6055 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6056 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6057 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6058 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6059 # Universal matching matches any instance, even if the |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6060 # 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
|
6061 # makes no sense |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6062 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6063 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6064 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6065 'SeriesDescription' : '' # Universal matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6066 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6067 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6068 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6069 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6070 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6071 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6072 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6073 ## "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
|
6074 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6075 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6076 # 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
|
6077 # is wiped out by the normalization |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6078 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6079 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6080 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6081 'ProtocolName' : 'NOPE' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6082 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6083 'Normalize' : False |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6084 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6085 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6086 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6087 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6088 '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
|
6089 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6090 'Normalize' : False |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6091 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6092 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6093 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6094 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6095 'ProtocolName' : 'THIS^VALUE^IS^WIPED^OUT' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6096 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6097 'Normalize' : True |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6098 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6099 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6100 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6101 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6102 'ProtocolName' : '*' # Matches, as wiped out by the normalization |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6103 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6104 'Normalize' : True |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6105 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6106 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6107 for normalize in [ True, False ]: |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6108 # 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
|
6109 # normalization has no effect |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6110 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6111 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6112 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6113 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6114 'ProtocolName' : '' # Universal matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6115 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6116 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6117 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6118 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6119 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6120 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6121 '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
|
6122 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6123 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6124 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6125 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6126 'Level' : 'Series', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6127 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6128 'ProtocolName' : '*MISMATCHED^VALUE*' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6129 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6130 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6131 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6132 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6133 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6134 'Level' : 'Study', |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6135 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6136 'ProtocolName' : '' # Universal matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6137 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6138 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6139 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6140 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6141 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6142 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6143 ## "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
|
6144 ## |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6145 |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6146 for level in [ 'Study', 'Series' ] : |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6147 for normalize in [ True, False ]: |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6148 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6149 'Level' : level, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6150 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6151 'StudyInstanceUID' : '' # Universal matching |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6152 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6153 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6154 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6155 self.assertEqual(0, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6156 'Level' : level, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6157 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6158 'StudyInstanceUID' : 'MISMATCHED^VALUE' |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6159 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6160 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6161 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6162 self.assertEqual(1, CountAnswers({ |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6163 'Level' : level, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6164 'Query' : { |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6165 '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
|
6166 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6167 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6168 })) |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6169 |
| 269 | 6170 # 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
|
6171 # This test fails on Orthanc <= 1.5.8 |
| 269 | 6172 self.assertRaises(Exception, lambda: CountAnswers({ |
|
263
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6173 'Level' : level, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6174 'Query' : { |
| 269 | 6175 'StudyInstanceUID' : '*' |
|
263
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6176 }, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6177 'Normalize' : normalize, |
|
a2719263fd04
test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
6178 })) |
| 265 | 6179 |
| 6180 | |
| 6181 def test_rendered(self): | |
| 6182 # New in Orthanc 1.6.0 | |
| 6183 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID'] | |
| 6184 im = GetImage(_REMOTE, '/instances/%s/rendered' % i) | |
| 6185 self.assertEqual("RGB", im.mode) | |
| 6186 self.assertEqual(41, im.size[0]) | |
| 6187 self.assertEqual(41, im.size[1]) | |
| 6188 | |
| 6189 # http://effbot.org/zone/pil-comparing-images.htm | |
| 6190 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png')) | |
| 6191 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None) | |
| 6192 | |
| 6193 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10' % i) | |
| 6194 self.assertEqual("RGB", im.mode) | |
| 6195 self.assertEqual(10, im.size[0]) | |
| 6196 self.assertEqual(10, im.size[1]) | |
| 6197 | |
| 6198 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10' % i) | |
| 6199 self.assertEqual("RGB", im.mode) | |
| 6200 self.assertEqual(10, im.size[0]) | |
| 6201 self.assertEqual(10, im.size[1]) | |
| 6202 | |
| 6203 im = GetImage(_REMOTE, '/instances/%s/rendered?height=128' % i) | |
| 6204 self.assertEqual("RGB", im.mode) | |
| 6205 self.assertEqual(128, im.size[0]) | |
| 6206 self.assertEqual(128, im.size[1]) | |
| 6207 | |
| 6208 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10&smooth=0' % i) | |
| 6209 self.assertEqual("RGB", im.mode) | |
| 6210 self.assertEqual(10, im.size[0]) | |
| 6211 self.assertEqual(10, im.size[1]) | |
| 6212 | |
| 6213 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10&smooth=1' % i) | |
| 6214 self.assertEqual("RGB", im.mode) | |
| 6215 self.assertEqual(10, im.size[0]) | |
| 6216 self.assertEqual(10, im.size[1]) | |
| 6217 | |
| 6218 im = GetImage(_REMOTE, '/instances/%s/rendered?height=5&width=10' % i) | |
| 6219 self.assertEqual("RGB", im.mode) | |
| 6220 self.assertEqual(5, im.size[0]) | |
| 6221 self.assertEqual(5, im.size[1]) | |
| 6222 | |
| 6223 | |
| 6224 # Grayscale image | |
| 6225 i = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] | |
| 6226 im = GetImage(_REMOTE, '/instances/%s/rendered' % i) | |
| 6227 self.assertEqual("L", im.mode) | |
| 6228 self.assertEqual(288, im.size[0]) | |
| 6229 self.assertEqual(288, im.size[1]) | |
| 6230 self.assertEqual(0, im.getpixel((0, 0))) | |
| 6231 | |
| 6232 # Those are the original windowing parameters that are written | |
| 6233 # inside the DICOM file | |
| 6234 im2 = GetImage(_REMOTE, '/instances/%s/rendered?window-center=248.009544468547&window-width=431.351843817788' % i) | |
| 6235 self.assertEqual("L", im2.mode) | |
| 6236 self.assertEqual(288, im2.size[0]) | |
| 6237 self.assertEqual(288, im2.size[1]) | |
| 6238 self.assertTrue(ImageChops.difference(im, im2).getbbox() is None) | |
| 6239 | |
| 6240 im = GetImage(_REMOTE, '/instances/%s/rendered?width=512&smooth=0' % i) | |
| 6241 self.assertEqual("L", im.mode) | |
| 6242 self.assertEqual(512, im.size[0]) | |
| 6243 self.assertEqual(512, im.size[1]) | |
| 6244 | |
| 6245 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&smooth=0' % i) | |
| 6246 self.assertEqual("L", im.mode) | |
| 6247 self.assertEqual(10, im.size[0]) | |
| 6248 self.assertEqual(10, im.size[1]) | |
| 6249 | |
| 6250 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&smooth=1' % i) | |
| 6251 self.assertEqual("L", im.mode) | |
| 6252 self.assertEqual(10, im.size[0]) | |
| 6253 self.assertEqual(10, im.size[1]) | |
| 6254 | |
| 6255 im = GetImage(_REMOTE, '/instances/%s/rendered?width=1&window-center=-1000' % i) | |
| 6256 self.assertEqual("L", im.mode) | |
| 6257 self.assertEqual(1, im.size[0]) | |
| 6258 self.assertEqual(1, im.size[1]) | |
| 6259 self.assertEqual(255, im.getpixel((0, 0))) | |
| 6260 | |
| 6261 im = GetImage(_REMOTE, '/instances/%s/rendered?width=1&window-center=1000' % i) | |
| 6262 self.assertEqual("L", im.mode) | |
| 6263 self.assertEqual(1, im.size[0]) | |
| 6264 self.assertEqual(1, im.size[1]) | |
| 6265 self.assertEqual(0, im.getpixel((0, 0))) | |
| 6266 | |
| 6267 | |
| 6268 # Test monochrome 1 | |
| 6269 i = UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')['ID'] | |
| 6270 im = GetImage(_REMOTE, '/instances/%s/rendered' % i) | |
| 6271 self.assertEqual("L", im.mode) | |
| 6272 self.assertEqual(2010, im.size[0]) | |
| 6273 self.assertEqual(2446, im.size[1]) | |
| 6274 self.assertEqual(0, im.getpixel((0, 0))) | |
| 6275 im = GetImage(_REMOTE, '/instances/%s/rendered?width=20' % i) | |
| 6276 self.assertEqual("L", im.mode) | |
| 6277 self.assertEqual(20, im.size[0]) | |
| 6278 self.assertEqual(24, im.size[1]) | |
| 6279 im = GetImage(_REMOTE, '/instances/%s/rendered?height=24' % i) | |
| 6280 self.assertEqual("L", im.mode) | |
| 6281 self.assertEqual(20, im.size[0]) | |
| 6282 self.assertEqual(24, im.size[1]) | |
| 6283 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&height=24' % i) | |
| 6284 self.assertEqual("L", im.mode) | |
| 6285 self.assertEqual(10, im.size[0]) | |
| 6286 self.assertEqual(12, im.size[1]) | |
| 6287 im = GetImage(_REMOTE, '/instances/%s/rendered?width=40&height=24' % i) | |
| 6288 self.assertEqual("L", im.mode) | |
| 6289 self.assertEqual(20, im.size[0]) | |
| 6290 self.assertEqual(24, im.size[1]) | |
|
268
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6291 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6292 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6293 def test_bitbucket_issue_154(self): |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6294 # "Matching against list of UID-s by C-MOVE" |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6295 # 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
|
6296 a = UploadInstance(_REMOTE, 'Issue154-d1.dcm') ['ID'] |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6297 b = UploadInstance(_REMOTE, 'Issue154-d2.dcm') ['ID'] |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6298 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6299 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
|
6300 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
|
6301 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
|
6302 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6303 # C-FIND is working on list of UIDs |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6304 i = CallFindScu([ '-k', 'QueryRetrieveLevel=SERIES', |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6305 '-k', 'StudyInstanceUID=%s' % study, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6306 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2) ]) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6307 series = re.findall('\(0020,000e\).*?\[(.*?)\]', i) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6308 self.assertEqual(2, len(series)) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6309 self.assertTrue(series1 in series) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6310 self.assertTrue(series2 in series) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6311 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6312 # Individual retrieval is working in Orthanc < 1.6.0 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6313 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6314 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6315 '--study', '-k', 'QueryRetrieveLevel=SERIES', |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6316 '-k', 'StudyInstanceUID=%s' % study, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6317 '-k', 'SeriesInstanceUID=%s' % series1, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6318 ]))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6319 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6320 '--study', '-k', 'QueryRetrieveLevel=SERIES', |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6321 '-k', 'StudyInstanceUID=%s' % study, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6322 '-k', 'SeriesInstanceUID=%s' % series2, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6323 ]))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6324 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6325 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6326 DropOrthanc(_LOCAL) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6327 |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6328 # 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
|
6329 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6330 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6331 '--study', '-k', 'QueryRetrieveLevel=SERIES', |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6332 '-k', 'StudyInstanceUID=%s' % study, |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6333 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2), |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6334 ]))) |
|
c8d79d8258cd
test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
267
diff
changeset
|
6335 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6336 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6337 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6338 def test_storage_commitment_api(self): |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6339 # 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
|
6340 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6341 def WaitTransaction(uid): |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6342 while True: |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6343 s = DoGet(_REMOTE, '/storage-commitment/%s' % uid) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6344 if s['Status'] != 'Pending': |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6345 return s |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6346 else: |
|
342
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6347 time.sleep(0.01) |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6348 |
| 281 | 6349 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6350 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
|
6351 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
|
6352 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6353 # Against self |
| 281 | 6354 transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', { |
| 6355 "DicomInstances" : [ [ sopClassUid, sopInstanceUid ] ], | |
| 6356 }) ['ID'] | |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6357 self.assertTrue(transaction.startswith('2.25.')) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6358 |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6359 result = WaitTransaction(transaction) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6360 self.assertEqual('ORTHANC', result['RemoteAET']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6361 self.assertEqual('Success', result['Status']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6362 self.assertEqual(1, len(result['Success'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6363 self.assertEqual(0, len(result['Failures'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6364 self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6365 self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6366 |
| 281 | 6367 tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', { |
| 6368 "DicomInstances" : [ | |
| 6369 { 'SOPClassUID' : sopClassUid, | |
| 6370 'SOPInstanceUID' : sopInstanceUid }, | |
| 6371 ], | |
| 6372 }) | |
| 6373 self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID']) | |
| 6374 self.assertEqual(result, WaitTransaction(transaction)) | |
| 6375 | |
| 6376 tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', { | |
| 6377 "Resources" : [ | |
| 6378 instance['ID'], | |
| 6379 instance['ParentSeries'], | |
| 6380 instance['ParentStudy'], | |
| 6381 instance['ParentPatient'], | |
| 6382 ] | |
| 6383 }) | |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6384 self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6385 self.assertEqual(result, WaitTransaction(transaction)) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6386 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6387 |
| 281 | 6388 transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', { |
| 6389 "DicomInstances" : [ | |
| 6390 [ 'nope', 'nope2' ], | |
| 6391 [ sopClassUid, sopInstanceUid ], | |
| 6392 ], | |
| 6393 }) ['ID'] | |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6394 self.assertTrue(transaction.startswith('2.25.')) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6395 |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6396 result = WaitTransaction(transaction) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6397 self.assertEqual('ORTHANC', result['RemoteAET']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6398 self.assertEqual('Failure', result['Status']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6399 self.assertEqual(1, len(result['Success'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6400 self.assertEqual(1, len(result['Failures'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6401 self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6402 self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6403 self.assertEqual('nope', result['Failures'][0]['SOPClassUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6404 self.assertEqual('nope2', result['Failures'][0]['SOPInstanceUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6405 self.assertEqual(274, result['Failures'][0]['FailureReason']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6406 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6407 # Cannot remove items from a failed storage commitment transaction |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6408 self.assertRaises(Exception, lambda: |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6409 DoPost(_REMOTE, '/storage-commitment/%s/remove' % transaction)) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6410 |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6411 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6412 # 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
|
6413 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
|
6414 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
|
6415 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
|
6416 "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
|
6417 [ 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
|
6418 ] |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
6419 })) |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6420 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6421 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6422 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6423 def test_storage_commitment_store(self): |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6424 # 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
|
6425 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6426 def WaitTransaction(uid): |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6427 while True: |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6428 s = DoGet(_REMOTE, '/storage-commitment/%s' % uid) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6429 if s['Status'] != 'Pending': |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6430 return s |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6431 else: |
|
342
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
6432 time.sleep(0.01) |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6433 |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6434 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6435 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6436 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6437 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6438 # 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
|
6439 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
|
6440 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
|
6441 '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
|
6442 '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
|
6443 })) |
|
279
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6444 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6445 j = DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6446 'Resources' : [ i ], |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6447 'StorageCommitment' : False, |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6448 }) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6449 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6450 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6451 j = DoPost(_REMOTE, '/modalities/self/store', { |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6452 'Resources' : [ i ], |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6453 'StorageCommitment' : True, |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6454 }) |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6455 |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6456 transaction = j['StorageCommitmentTransactionUID'] |
|
31e1e49df380
starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
269
diff
changeset
|
6457 self.assertTrue(transaction.startswith('2.25.')) |
|
280
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6458 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6459 result = WaitTransaction(transaction) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6460 self.assertEqual('ORTHANC', result['RemoteAET']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6461 self.assertEqual('Success', result['Status']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6462 self.assertEqual(1, len(result['Success'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6463 self.assertEqual(0, len(result['Failures'])) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6464 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
|
6465 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
|
6466 result['Success'][0]['SOPInstanceUID']) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6467 |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6468 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6469 DoPost(_REMOTE, '/storage-commitment/%s/remove' % transaction) |
|
5daa3896981c
testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
279
diff
changeset
|
6470 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
285
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6471 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6472 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6473 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
|
6474 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6475 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6476 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6477 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f: |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6478 dicom = f.read() |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6479 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6480 self.assertRaises(Exception, lambda: DoPost( |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6481 _REMOTE, '/modalities/orthanctest/store-straight', 'nope', 'nope')) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6482 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6483 answer = DoPost(_REMOTE, '/modalities/orthanctest/store-straight', dicom, 'nope') |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6484 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6485 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
|
6486 answer['SOPClassUID']) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6487 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
|
6488 answer['SOPInstanceUID']) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6489 |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6490 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
281a32ecc5c1
test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
281
diff
changeset
|
6491 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
289
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6492 |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6493 |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6494 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
|
6495 # Add a RLE-encoded DICOM file |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6496 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
|
6497 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6498 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6499 rleSize = len(DoGet(_REMOTE, '/instances/%s/file' % i)) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6500 |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6501 # Export the instance, with transcoding: "_REMOTE" is the |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6502 # Orthanc server being tested |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6503 try: |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6504 DoDelete(_REMOTE, '/modalities/toto') |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6505 except: |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6506 pass |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6507 |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6508 params = DoGet(_REMOTE, '/modalities?expand') ['orthanctest'] |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6509 DoPut(_REMOTE, '/modalities/toto', params) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6510 DoPost(_REMOTE, '/modalities/toto/store', str(i), 'text/plain') |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6511 j = DoGet(_LOCAL, '/instances') |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6512 self.assertEqual(1, len(j)) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6513 uncompressedSize = len(DoGet(_LOCAL, '/instances/%s/file' % j[0])) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6514 self.assertTrue(uncompressedSize > rleSize / 2) |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6515 |
|
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
|
6516 # 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
|
6517 params['AllowTranscoding'] = False |
|
4a70411ac9ad
test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
285
diff
changeset
|
6518 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
|
6519 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
|
6520 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
|
6521 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
|
6522 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
|
6523 DoDelete(_REMOTE, '/modalities/toto') |
|
290
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6524 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6525 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6526 def test_bitbucket_issue_169(self): |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6527 with open(GetDatabasePath('Issue169.dcm.bz2'), 'rb') as f: |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6528 dicom = bz2.decompress(f.read()) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6529 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6530 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
|
6531 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6532 self.assertEqual(44350560, len(dicom)) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6533 i = DoPost(_REMOTE, '/instances', dicom, 'application/dicom') ['ID'] |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6534 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6535 tags = DoGet(_REMOTE, '/instances/%s/tags' % i) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6536 self.assertEqual('NORMAL', tags['1337,1001']['Value']) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6537 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6538 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6539 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6540 j = DoGet(_LOCAL, '/instances') |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6541 self.assertEqual(1, len(j)) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6542 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6543 # 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
|
6544 # 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
|
6545 # Little Endian" (1.2.840.10008.1.2) |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6546 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax( |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6547 DoGet(_LOCAL, '/instances/%s/file' % j[0]))) |
|
290
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6548 |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6549 # 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
|
6550 # because of this transcoding |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6551 tags = DoGet(_LOCAL, '/instances/%s/tags' % j[0]) |
|
b5333f87065b
test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
289
diff
changeset
|
6552 self.assertEqual('NORMAL', tags['1337,1001']['Value']) |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6553 |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6554 |
|
302
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6555 def test_modify_transcode_instance(self): |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6556 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6557 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax( |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6558 DoGet(_REMOTE, '/instances/%s/file' % i))) |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6559 |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6560 a = ExtractDicomTags(DoGet(_REMOTE, '/instances/%s/file' % i), [ 'SOPInstanceUID' ]) [0] |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6561 self.assertTrue(len(a) > 20) |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6562 |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6563 SYNTAXES = [ |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6564 '1.2.840.10008.1.2', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6565 '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
|
6566 #'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
|
6567 '1.2.840.10008.1.2.2', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6568 '1.2.840.10008.1.2.4.50', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6569 '1.2.840.10008.1.2.4.51', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6570 '1.2.840.10008.1.2.4.57', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6571 '1.2.840.10008.1.2.4.70', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6572 ] |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6573 |
| 304 | 6574 if HasGdcmPlugin(_REMOTE): |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6575 SYNTAXES = SYNTAXES + [ |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6576 '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
|
6577 '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
|
6578 '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
|
6579 '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
|
6580 ] |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6581 |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6582 for syntax in SYNTAXES: |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6583 transcoded = DoPost(_REMOTE, '/instances/%s/modify' % i, { |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6584 'Transcode' : syntax, |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6585 'Keep' : [ 'SOPInstanceUID' ], |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6586 'Force' : True, |
|
291
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6587 }) |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6588 |
|
cfa785074c64
test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
290
diff
changeset
|
6589 self.assertEqual(syntax, GetTransferSyntax(transcoded)) |
|
292
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6590 |
|
299
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6591 b = ExtractDicomTags(transcoded, [ 'SOPInstanceUID' ]) [0] |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6592 self.assertTrue(len(b) > 20) |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6593 if syntax in [ '1.2.840.10008.1.2.4.50', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6594 '1.2.840.10008.1.2.4.51', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6595 '1.2.840.10008.1.2.4.81', |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6596 '1.2.840.10008.1.2.4.91' ]: |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6597 # Lossy transcoding: The SOP instance UID must have changed |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6598 self.assertNotEqual(a, b) |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6599 else: |
|
c2144cf4bd83
HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
293
diff
changeset
|
6600 self.assertEqual(a, b) |
|
292
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6601 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6602 def test_archive_transcode(self): |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6603 info = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm') |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6604 |
|
293
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6605 # GET on "/media" |
|
292
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6606 z = GetArchive(_REMOTE, '/patients/%s/media' % info['ParentPatient']) |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6607 self.assertEqual(2, len(z.namelist())) |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6608 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
|
6609 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6610 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
|
6611 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6612 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
|
6613 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
|
6614 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6615 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
|
6616 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
|
6617 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6618 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
|
6619 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
|
6620 |
|
293
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6621 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6622 # POST on "/media" |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6623 self.assertRaises(Exception, lambda: PostArchive( |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6624 _REMOTE, '/patients/%s/media' % info['ParentPatient'], { 'Transcode' : 'nope' })) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6625 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6626 z = PostArchive(_REMOTE, '/patients/%s/media' % info['ParentPatient'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6627 'Transcode' : '1.2.840.10008.1.2.4.50', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6628 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6629 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
|
6630 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6631 z = PostArchive(_REMOTE, '/studies/%s/media' % info['ParentStudy'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6632 'Transcode' : '1.2.840.10008.1.2.4.51', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6633 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6634 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
|
6635 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6636 z = PostArchive(_REMOTE, '/series/%s/media' % info['ParentSeries'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6637 'Transcode' : '1.2.840.10008.1.2.4.57', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6638 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6639 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
|
6640 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6641 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6642 # GET on "/archive" |
|
292
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6643 z = GetArchive(_REMOTE, '/patients/%s/archive' % info['ParentPatient']) |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6644 self.assertEqual(1, len(z.namelist())) |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6645 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
|
6646 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6647 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
|
6648 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6649 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
|
6650 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
|
6651 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6652 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
|
6653 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
|
6654 |
|
e1827a4f5d3b
test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
291
diff
changeset
|
6655 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
|
6656 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
|
6657 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6658 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6659 # POST on "/archive" |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6660 self.assertRaises(Exception, lambda: PostArchive( |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6661 _REMOTE, '/patients/%s/archive' % info['ParentPatient'], { 'Transcode' : 'nope' })) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6662 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6663 z = PostArchive(_REMOTE, '/patients/%s/archive' % info['ParentPatient'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6664 'Transcode' : '1.2.840.10008.1.2.4.50', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6665 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6666 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
|
6667 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6668 z = PostArchive(_REMOTE, '/studies/%s/archive' % info['ParentStudy'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6669 'Transcode' : '1.2.840.10008.1.2.4.51', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6670 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6671 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
|
6672 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6673 z = PostArchive(_REMOTE, '/series/%s/archive' % info['ParentSeries'], { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6674 'Transcode' : '1.2.840.10008.1.2.4.57', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6675 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6676 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
|
6677 |
|
293
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6678 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6679 # "/tools/create-*" |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6680 z = PostArchive(_REMOTE, '/tools/create-archive', { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6681 'Resources' : [ info['ParentStudy'] ], |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6682 'Transcode' : '1.2.840.10008.1.2.4.50', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6683 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6684 self.assertEqual(1, len(z.namelist())) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6685 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
|
6686 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6687 z = PostArchive(_REMOTE, '/tools/create-media', { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6688 'Resources' : [ info['ParentStudy'] ], |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6689 'Transcode' : '1.2.840.10008.1.2.4.51', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6690 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6691 self.assertEqual(2, len(z.namelist())) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6692 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
|
6693 |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6694 z = PostArchive(_REMOTE, '/tools/create-media-extended', { |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6695 'Resources' : [ info['ParentStudy'] ], |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6696 'Transcode' : '1.2.840.10008.1.2.4.57', |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6697 }) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6698 self.assertEqual(2, len(z.namelist())) |
|
032722c3e919
extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
292
diff
changeset
|
6699 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
|
6700 |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6701 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2): |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6702 z = GetArchive(_REMOTE, '/tools/create-archive?resources=%s&transcode=1.2.840.10008.1.2.4.50' % info['ParentStudy']) |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6703 self.assertEqual(1, len(z.namelist())) |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6704 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(z.read(z.namelist()[0]))) |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6705 |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6706 z = GetArchive(_REMOTE, '/tools/create-media?resources=%s&transcode=1.2.840.10008.1.2.4.51' % info['ParentStudy']) |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6707 self.assertEqual(2, len(z.namelist())) |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6708 self.assertEqual('1.2.840.10008.1.2.4.51', GetTransferSyntax(z.read('IMAGES/IM0'))) |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6709 |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6710 z = GetArchive(_REMOTE, '/tools/create-media-extended?resources=%s&transcode=1.2.840.10008.1.2.4.57' % info['ParentStudy']) |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6711 self.assertEqual(2, len(z.namelist())) |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6712 self.assertEqual('1.2.840.10008.1.2.4.57', GetTransferSyntax(z.read('IMAGES/IM0'))) |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6713 |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6714 |
|
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
6715 |
| 308 | 6716 |
| 587 | 6717 def test_download_file_transcode(self): |
| 6718 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2): | |
| 6719 | |
| 6720 info = UploadInstance(_REMOTE, 'TransferSyntaxes/1.2.840.10008.1.2.1.dcm') | |
| 6721 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax( | |
| 6722 DoGet(_REMOTE, '/instances/%s/file' % info['ID']))) | |
| 6723 | |
| 6724 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax( | |
| 6725 DoGet(_REMOTE, '/instances/%s/file?transcode=1.2.840.10008.1.2.4.50' % info['ID']))) | |
| 6726 | |
| 6727 | |
|
301
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6728 def test_modify_keep_source(self): |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6729 # 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
|
6730 i = UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6731 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6732 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6733 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], { |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6734 'Replace' : { |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6735 'StationName' : 'TEST', |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6736 }, |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6737 'KeepSource' : True, |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6738 }) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6739 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6740 s = DoGet(_REMOTE, '/studies') |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6741 self.assertEqual(2, len(s)) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6742 self.assertTrue(i['ParentStudy'] in s) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6743 self.assertTrue(j['ID'] in s) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6744 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6745 DoDelete(_REMOTE, '/studies/%s' % j['ID']) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6746 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6747 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6748 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], { |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6749 'Replace' : { |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6750 'StationName' : 'TEST', |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6751 }, |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6752 'KeepSource' : False, |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6753 }) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6754 |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6755 s = DoGet(_REMOTE, '/studies') |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6756 self.assertEqual(1, len(s)) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6757 self.assertFalse(i['ParentStudy'] in s) |
|
6652d5720a45
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
300
diff
changeset
|
6758 self.assertTrue(j['ID'] in s) |
|
302
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6759 |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6760 |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6761 def test_modify_transcode_study(self): |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6762 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm') |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6763 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
|
6764 DoGet(_REMOTE, '/instances/%s/file' % i['ID']))) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6765 |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6766 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6767 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], { |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6768 'Transcode' : '1.2.840.10008.1.2.4.50', |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6769 'KeepSource' : False |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6770 }) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6771 |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6772 k = DoGet(_REMOTE, '/instances') |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6773 self.assertEqual(1, len(k)) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6774 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
|
6775 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
|
6776 DoGet(_REMOTE, '/instances/%s/file' % k[0]))) |
|
22b6dd0f8c84
test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
6777 |
|
305
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
6778 |
|
498
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6779 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
|
6780 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
|
6781 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
|
6782 'Replace' : replaceTags, |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6783 'Force': force, |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6784 'KeepSource' : keepSource |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6785 }) |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6786 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6787 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
|
6788 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6789 i = UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6790 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
|
6791 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6792 # 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
|
6793 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
|
6794 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
|
6795 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6796 # 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
|
6797 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
|
6798 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
|
6799 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6800 # 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
|
6801 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
|
6802 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
|
6803 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6804 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6805 # 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
|
6806 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
|
6807 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
|
6808 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
|
6809 |
| 500 | 6810 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
|
6811 # 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
|
6812 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
|
6813 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
|
6814 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
|
6815 |
|
62f37c13d4d0
new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents:
497
diff
changeset
|
6816 |
|
504
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6817 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
|
6818 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
|
6819 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
|
6820 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6821 if dropOrthanc: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6822 DropOrthanc(_REMOTE) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6823 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6824 UploadFolder(_REMOTE, 'Knee/T1') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6825 UploadFolder(_REMOTE, 'Knee/T2') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6826 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6827 if dropOrthanc: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6828 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
|
6829 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6830 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
|
6831 'Replace' : replaceTags, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6832 'Force': force, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6833 'KeepSource' : keepSource |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6834 }) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6835 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
|
6836 return (modifyResponse, modifiedResource) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6837 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6838 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
|
6839 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
|
6840 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
|
6841 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
|
6842 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
|
6843 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
|
6844 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
|
6845 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6846 ####### study level tests ####### |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6847 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6848 # 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
|
6849 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
|
6850 'StudyInstanceUID': kneeStudyInstanceUID, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6851 'StudyDescription': 'TOTO' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6852 }, force=True, keepSource=True) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6853 self.assertEqual(kneeStudy, modifyResponse['ID']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6854 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
|
6855 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6856 # 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
|
6857 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
|
6858 'StudyInstanceUID': kneeStudyInstanceUID, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6859 'PatientName': 'TOTO' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6860 }, force=True, keepSource=True) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6861 self.assertEqual(kneeStudy, modifyResponse['ID']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6862 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
|
6863 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
|
6864 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
|
6865 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6866 # 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
|
6867 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
|
6868 'StudyInstanceUID': kneeStudyInstanceUID, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6869 'PatientID': 'TOTO_ID', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6870 'PatientName': 'TOTO' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6871 }, force=True, keepSource=True) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6872 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
|
6873 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
|
6874 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
|
6875 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
|
6876 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
|
6877 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
|
6878 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6879 ####### series level tests ####### |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6880 # 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
|
6881 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
|
6882 'SeriesInstanceUID': kneeSeriesInstanceUIDT1, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6883 'StudyInstanceUID': kneeStudyInstanceUID, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6884 'SeriesDescription': 'TOTO' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6885 }, force=True, keepSource=True) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6886 self.assertEqual(kneeSeriesT1, modifyResponse['ID']) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6887 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
|
6888 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
|
6889 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6890 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6891 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
|
6892 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
|
6893 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6894 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
|
6895 patientDicomId = 'TEST_1' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6896 patientName = 'Test' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6897 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
|
6898 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
|
6899 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6900 DropOrthanc(_REMOTE) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6901 UploadFolder(_REMOTE, 'PatientWith2studies') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6902 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6903 # 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
|
6904 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6905 if True: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6906 # 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
|
6907 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
|
6908 'Replace' : {'PatientName': "TOTO"}, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6909 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6910 'KeepSource' : True |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6911 })) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6912 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6913 if True: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6914 # 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
|
6915 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
|
6916 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6917 'PatientName': 'TOTO' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6918 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6919 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6920 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6921 }) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6922 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
|
6923 # 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
|
6924 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
|
6925 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6926 # 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
|
6927 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
|
6928 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
|
6929 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
|
6930 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
|
6931 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
|
6932 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6933 if True: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6934 # 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
|
6935 DropOrthanc(_REMOTE) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6936 UploadFolder(_REMOTE, 'PatientWith2studies') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6937 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6938 # 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
|
6939 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
|
6940 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6941 'PatientName': 'TOTO' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6942 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6943 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID'], |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6944 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6945 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6946 }) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6947 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
|
6948 # 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
|
6949 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
|
6950 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6951 # 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
|
6952 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
|
6953 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
|
6954 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
|
6955 # 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
|
6956 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
|
6957 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
|
6958 # 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
|
6959 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
|
6960 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
|
6961 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6962 if True: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6963 # 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
|
6964 # 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
|
6965 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
|
6966 'Replace' : {'PatientName': "TOTO"}, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6967 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6968 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID'], |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6969 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6970 })) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6971 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6972 if True: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6973 # 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
|
6974 DropOrthanc(_REMOTE) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6975 UploadFolder(_REMOTE, 'PatientWith2studies') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6976 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6977 # 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
|
6978 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
|
6979 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6980 'PatientName': 'TOTO' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6981 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6982 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID'], |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6983 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6984 'KeepSource' : True |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6985 }) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6986 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
|
6987 # 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
|
6988 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
|
6989 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
6990 # 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
|
6991 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
|
6992 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
|
6993 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
|
6994 # 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
|
6995 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
|
6996 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
|
6997 # 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
|
6998 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
|
6999 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
|
7000 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7001 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7002 if True: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7003 # 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
|
7004 DropOrthanc(_REMOTE) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7005 UploadFolder(_REMOTE, 'PatientWith2studies') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7006 UploadFolder(_REMOTE, 'Knee/T1') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7007 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7008 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
|
7009 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7010 # 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
|
7011 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7012 # 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
|
7013 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
|
7014 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7015 'PatientID': 'TEST_1' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7016 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7017 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7018 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7019 })) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7020 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7021 # 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
|
7022 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
|
7023 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7024 'PatientID': 'TEST_1', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7025 'PatientName': 'Test', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7026 'PatientBirthDate': '19000101', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7027 'PatientSex': 'F' # this is wrong ! |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7028 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7029 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7030 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7031 })) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7032 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7033 # 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
|
7034 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
|
7035 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7036 'PatientID': 'TEST_1', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7037 'PatientName': 'Test', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7038 'PatientBirthDate': '19000101', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7039 'PatientSex': 'M', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7040 '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
|
7041 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7042 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7043 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7044 })) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7045 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7046 # 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
|
7047 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
|
7048 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7049 'PatientID': 'TEST_1', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7050 'PatientName': 'Test', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7051 'PatientBirthDate': '19000101', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7052 'PatientSex': 'M' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7053 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7054 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7055 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7056 }) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7057 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
|
7058 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
|
7059 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
|
7060 # 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
|
7061 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
|
7062 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7063 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7064 if True: |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7065 # 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
|
7066 DropOrthanc(_REMOTE) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7067 UploadFolder(_REMOTE, 'PatientWith2studies') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7068 UploadFolder(_REMOTE, 'Knee/T1') |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7069 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7070 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
|
7071 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
|
7072 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7073 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
|
7074 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7075 # 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
|
7076 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
|
7077 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7078 'PatientName': 'Test Knee', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7079 'StudyDescription': 'Knee study' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7080 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7081 'Keep': ['StudyInstanceUID'], |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7082 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7083 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7084 }) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7085 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
|
7086 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
|
7087 # 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
|
7088 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
|
7089 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
|
7090 |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7091 # 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
|
7092 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
|
7093 'Replace' : { |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7094 'PatientName': 'Test Knee 2', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7095 'PatientID': 'TEST_KNEE_2', |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7096 'StudyDescription': 'Knee study 2' |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7097 }, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7098 'Force': True, |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7099 'KeepSource' : False |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7100 }) |
|
16ff0375835d
new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents:
501
diff
changeset
|
7101 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
|
7102 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
|
7103 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
|
7104 # 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
|
7105 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
|
7106 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
|
7107 # 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
|
7108 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
|
7109 |
|
305
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7110 def test_store_peer_transcoding(self): |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7111 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7112 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7113 SYNTAXES = [ |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7114 '1.2.840.10008.1.2', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7115 '1.2.840.10008.1.2.1', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7116 #'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
|
7117 '1.2.840.10008.1.2.2', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7118 '1.2.840.10008.1.2.4.50', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7119 '1.2.840.10008.1.2.4.51', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7120 '1.2.840.10008.1.2.4.57', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7121 '1.2.840.10008.1.2.4.70', |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7122 ] |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7123 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7124 if HasGdcmPlugin(_REMOTE): |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7125 SYNTAXES = SYNTAXES + [ |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7126 '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
|
7127 '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
|
7128 '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
|
7129 '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
|
7130 ] |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7131 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7132 for syntax in SYNTAXES: |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7133 body = { |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7134 'Resources' : [ i ], |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7135 } |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7136 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7137 if syntax != '1.2.840.10008.1.2.1': |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7138 body['Transcode'] = syntax |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7139 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7140 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7141 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7142 DoPost(_REMOTE, '/peers/peer/store', body, 'text/plain') |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7143 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7144 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7145 self.assertEqual(syntax, GetTransferSyntax( |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7146 DoGet(_LOCAL, '/instances/%s/file' % DoGet(_LOCAL, '/instances') [0]))) |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7147 |
|
ed20ead1a8b6
test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
304
diff
changeset
|
7148 DropOrthanc(_LOCAL) |
| 308 | 7149 |
| 7150 | |
| 295 | 7151 def test_getscu(self): |
| 307 | 7152 def CleanTarget(): |
| 7153 if os.path.isdir('/tmp/GETSCU'): | |
| 7154 shutil.rmtree('/tmp/GETSCU') | |
| 7155 os.makedirs('/tmp/GETSCU') | |
| 7156 | |
|
306
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
7157 env = {} |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
7158 if _DOCKER: |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
7159 # 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
|
7160 # and running in a GNU/Linux distribution running DCMTK |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
7161 # 3.6.0. Tell "getscu" where it can find the DICOM dictionary. |
| 529 | 7162 env['DCMDICTPATH'] = os.environ.get('DCMDICTPATH', '/usr/share/libdcmtk2/dicom.dic') |
|
306
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
7163 |
| 295 | 7164 # no transcoding required |
| 307 | 7165 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] |
| 7166 | |
| 7167 CleanTarget() | |
| 295 | 7168 |
|
306
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
7169 subprocess.check_call([ |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
7170 FindExecutable('getscu'), |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
7171 _REMOTE['Server'], |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
7172 str(_REMOTE['DicomPort']), |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
7173 '-aec', 'ORTHANC', |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
7174 '-aet', 'ORTHANCTEST', # pretend to be the other orthanc |
| 307 | 7175 '-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
|
7176 '-k', '0008,0052=STUDY', |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
7177 '--output-directory', '/tmp/GETSCU/' |
|
da2be3ff2db5
fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
296
diff
changeset
|
7178 ], env = env) |
| 295 | 7179 |
| 311 | 7180 f1 = '/tmp/GETSCU/MR.1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549' |
| 7181 self.assertTrue(os.path.isfile(f1)) | |
| 7182 with open(f1, 'rb') as f: | |
| 543 | 7183 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(f.read(), encoding='ISO-8859-1')) |
| 311 | 7184 |
| 307 | 7185 CleanTarget() |
| 295 | 7186 |
| 7187 # transcoding required | |
| 311 | 7188 UploadInstance(_REMOTE, 'TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm') |
| 307 | 7189 |
| 7190 subprocess.check_call([ | |
| 7191 FindExecutable('getscu'), | |
| 7192 _REMOTE['Server'], | |
| 7193 str(_REMOTE['DicomPort']), | |
| 7194 '-aec', 'ORTHANC', | |
| 7195 '-aet', 'ORTHANCTEST', # pretend to be the other orthanc | |
| 311 | 7196 '-k', '0020,000d=2.16.840.1.113669.632.20.1211.10000357775\\1.2.840.113663.1298.6234813.1.298.20000329.1115122', |
| 307 | 7197 '-k', '0008,0052=STUDY', |
| 7198 '--output-directory', '/tmp/GETSCU/' | |
| 7199 ], env = env) | |
| 7200 | |
| 311 | 7201 self.assertTrue(os.path.isfile(f1)) |
| 7202 with open(f1, 'rb') as f: | |
| 543 | 7203 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(f.read(), encoding='ISO-8859-1')) |
| 311 | 7204 |
| 7205 # This file is transcoded from "1.2.840.10008.1.2.4.50" to "1.2.840.10008.1.2.1" | |
| 7206 # (LittleEndianExplicit is proposed by default by "getscu") | |
| 7207 f2 = '/tmp/GETSCU/US.1.2.840.113663.1298.1.3.715.20000329.1115326' | |
| 7208 self.assertTrue(os.path.isfile(f2)) | |
| 7209 with open(f2, 'rb') as f: | |
| 7210 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
|
7211 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7212 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7213 def test_findscu_truncation(self): |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7214 # https://groups.google.com/forum/#!msg/orthanc-users/FkckWAHvso8/UbRBAhQ5CwAJ |
| 585 | 7215 # Fixed by: https://orthanc.uclouvain.be/hg/orthanc/rev/2724977419fb |
|
324
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7216 UploadInstance(_REMOTE, 'Multiframe.dcm') |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7217 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7218 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7219 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
|
7220 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7221 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyInstanceUID' ]) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7222 result = re.findall('\(0020,000d\).*?\[(.*?)\]', i) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7223 self.assertEqual(2, len(result)) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7224 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7225 # 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
|
7226 # study, leading to a string of 249 characters |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7227 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7228 'StudyInstanceUID=%s\\%s\\%s\\%s\\%s' % (( study, ) * 5) ]) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7229 result = re.findall('\(0020,000d\).*?\[(.*?)\]', i) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7230 self.assertEqual(1, len(result)) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7231 |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7232 # 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
|
7233 # study, leading to a string of 299 characters. In Orthanc <= |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7234 # 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
|
7235 # == 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
|
7236 # 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
|
7237 # "StudyInstanceUID" and returns all the available |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7238 # 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
|
7239 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7240 'StudyInstanceUID=%s\\%s\\%s\\%s\\%s\\%s' % (( study, ) * 6) ]) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7241 result = re.findall('\(0020,000d\).*?\[(.*?)\]', i) |
|
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7242 self.assertEqual(1, len(result)) |
|
328
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7243 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7244 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7245 def test_store_compressed(self): |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7246 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f: |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7247 dicom = f.read() |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7248 i = DoPost(_REMOTE, '/instances', dicom) ['ID'] |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7249 sourceSize = len(dicom) |
|
324
6164d39399ad
test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
323
diff
changeset
|
7250 |
|
328
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7251 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7252 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7253 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7254 # 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
|
7255 jobId = MonitorJob2(_REMOTE, lambda: DoPost( |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7256 _REMOTE, '/peers/peer/store', { |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7257 'Resources' : [ i ], |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7258 'Synchronous' : False, |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7259 })) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7260 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7261 job = DoGet(_REMOTE, '/jobs/%s' % jobId) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7262 self.assertFalse(job['Content']['Compress']) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7263 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
|
7264 self.assertEqual(str(sourceSize), job['Content']['Size']) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7265 |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7266 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7267 DropOrthanc(_LOCAL) |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7268 |
|
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
|
7269 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
|
7270 # 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
|
7271 # 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
|
7272 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/peers/peer/store', { |
|
328
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7273 'Resources' : [ i ], |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7274 'Compress' : True, |
|
8a462f9c5a97
test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
7275 })) |
|
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
|
7276 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
|
7277 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
7278 # 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
|
7279 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
|
7280 _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
|
7281 '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
|
7282 '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
|
7283 '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
|
7284 })) |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
7285 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
7286 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
|
7287 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
|
7288 |
|
17a74118d73a
allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6)
Alain Mazy <am@osimis.io>
parents:
508
diff
changeset
|
7289 # 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
|
7290 self.assertLess(int(job['Content']['Size']), sourceSize / 2) |
| 332 | 7291 |
| 7292 | |
| 7293 def test_move_ambra(self): | |
| 7294 # "Orthanc + Ambra: Query/Retrieve" (2020-08-25) | |
| 7295 # https://groups.google.com/g/orthanc-users/c/yIUnZ9v9-Zs/m/GQPXiAOiCQAJ | |
| 7296 | |
| 7297 UploadInstance(_REMOTE, '2019-06-17-VedranZdesic.dcm') | |
| 7298 | |
| 7299 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 7300 '--study', | |
| 7301 '-k', 'StudyInstanceUID=' | |
| 7302 ]))) | |
| 7303 | |
| 7304 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 7305 '--study', | |
| 7306 '-k', 'AccessionNumber=', | |
| 7307 ]))) | |
| 7308 | |
| 7309 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 7310 '--study', | |
| 7311 '-k', 'AccessionNumber=', | |
| 7312 '-k', 'StudyInstanceUID=' | |
| 7313 ]))) | |
| 7314 | |
| 7315 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 7316 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 7317 '--study', | |
| 7318 '-k', 'AccessionNumber=CT16000988', | |
| 7319 '-k', 'StudyInstanceUID=', | |
| 7320 ]))) | |
| 7321 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 7322 DropOrthanc(_LOCAL) | |
| 7323 | |
| 7324 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 7325 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 7326 '--study', | |
| 7327 '-k', 'AccessionNumber=CT16000988', | |
| 7328 '-k', 'StudyInstanceUID=1.2.840.113619.2.278.3.4194965761.659.1468842739.39', | |
| 7329 ]))) | |
| 7330 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 7331 DropOrthanc(_LOCAL) | |
| 7332 | |
| 7333 # This fails on Orthanc <= 1.7.3 | |
| 7334 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 7335 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ | |
| 7336 '--study', | |
| 7337 '-k', 'AccessionNumber=', | |
| 7338 '-k', 'StudyInstanceUID=1.2.840.113619.2.278.3.4194965761.659.1468842739.39' | |
| 7339 ]))) | |
| 7340 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 7341 DropOrthanc(_LOCAL) | |
|
333
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7342 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7343 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7344 def test_decode_elscint(self): |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7345 # 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
|
7346 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
|
7347 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
|
7348 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7349 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % a) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7350 self.assertEqual("L", im.mode) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7351 self.assertEqual(512, im.size[0]) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7352 self.assertEqual(512, im.size[1]) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7353 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7354 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % b) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7355 self.assertEqual("L", im.mode) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7356 self.assertEqual(512, im.size[0]) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7357 self.assertEqual(512, im.size[1]) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7358 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7359 # The two tests below fail on Orthanc <= 1.7.3 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7360 raw = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % a) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7361 self.assertEqual(512 * 512 * 2, len(raw)) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7362 |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7363 raw = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % b) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7364 self.assertEqual(512 * 512 * 2, len(raw)) |
|
695be643b0f4
test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
332
diff
changeset
|
7365 |
|
334
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
7366 |
|
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
7367 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
|
7368 # 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
|
7369 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
|
7370 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
|
7371 |
|
335
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
7372 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
|
7373 modalitiesInStudy = re.findall('\(0008,0061\).*?\[(.*?)\]', i) |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
7374 self.assertEqual(1, len(modalitiesInStudy)) |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
7375 self.assertEqual('CT\\PT ', modalitiesInStudy[0]) |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
7376 |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
7377 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
|
7378 # 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
|
7379 # 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
|
7380 |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
7381 if i in [ 'UX', 'UX\\MR' ]: |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
7382 expected = 0 |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
7383 else: |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
7384 expected = 1 |
|
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
7385 |
|
334
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
7386 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
7387 'Query' : { 'ModalitiesInStudy' : i }}) |
|
335
96718de2f29c
simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
7388 self.assertEqual(expected, len(a)) |
|
334
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
7389 |
|
971ff285302b
test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
333
diff
changeset
|
7390 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
|
7391 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
|
7392 self.assertEqual(expected, len(studyInstanceUid)) |
|
337
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
7393 |
|
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
7394 |
|
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
7395 def test_webdav(self): |
|
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
7396 self.assertRaises(Exception, lambda: DoPropFind(_REMOTE, '/webdav/', 2)) |
|
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
7397 |
|
342
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7398 for suffix in [ '', '/' ]: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7399 f = DoPropFind(_REMOTE, '/webdav' + suffix, 0) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7400 self.assertEqual(1, len(f)) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7401 self.assertTrue('/webdav/' in f.keys()) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7402 self.assertTrue(f['/webdav/']['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7403 self.assertEqual('webdav', f['/webdav/']['displayname']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7404 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7405 f = DoPropFind(_REMOTE, '/webdav' + suffix, 1) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7406 self.assertEqual(6, len(f)) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7407 self.assertTrue(f['/webdav/']['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7408 self.assertEqual('webdav', f['/webdav/']['displayname']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7409 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7410 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
|
7411 self.assertTrue(f['/webdav/%s' % i]['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7412 self.assertEqual(i, f['/webdav/%s' % i]['displayname']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7413 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7414 for depth in [ 0, 1 ]: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7415 for suffix2 in [ '', '/' ]: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7416 g = DoPropFind(_REMOTE, '/webdav/%s%s' % (i, suffix2), depth) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7417 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7418 if i == 'uploads': |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7419 # Empty folders might still exist in "/uploads/" |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7420 self.assertTrue('/webdav/uploads/' in g) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7421 self.assertEqual('uploads', g['/webdav/uploads/']['displayname']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7422 for j in g.items(): |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7423 self.assertTrue(g.items()[0][1]['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7424 else: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7425 self.assertEqual(1, len(g)) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7426 self.assertEqual('/webdav/%s/' % i, g.items()[0][0]) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7427 self.assertTrue(g.items()[0][1]['folder']) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7428 self.assertEqual(i, g.items()[0][1]['displayname']) |
|
341
66a36befb208
extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
337
diff
changeset
|
7429 |
|
342
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7430 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7431 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7432 DoPut(_REMOTE, '/webdav/uploads/dummy', f.read(), 'text/plain') |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7433 |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7434 while len(DoGet(_REMOTE, '/patients')) == 0: |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7435 time.sleep(0.01) |
|
bf8369ea3ff1
more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
341
diff
changeset
|
7436 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
337
ec13ace43bde
trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
335
diff
changeset
|
7437 |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
7438 |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
7439 def test_log_categories(self): |
| 350 | 7440 original = DoGet(_REMOTE, '/tools/log-level-http') |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
7441 |
| 350 | 7442 DoPut(_REMOTE, '/tools/log-level-http', 'default') |
| 7443 self.assertEqual('default', DoGet(_REMOTE, '/tools/log-level-http')) | |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
7444 DoGet(_REMOTE, '/system') |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
7445 |
| 350 | 7446 DoPut(_REMOTE, '/tools/log-level-http', 'verbose') |
| 7447 self.assertEqual('verbose', DoGet(_REMOTE, '/tools/log-level-http')) | |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
7448 DoGet(_REMOTE, '/system') |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
7449 |
| 350 | 7450 DoPut(_REMOTE, '/tools/log-level-http', 'trace') |
| 7451 self.assertEqual('trace', DoGet(_REMOTE, '/tools/log-level-http')) | |
|
349
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
7452 DoGet(_REMOTE, '/system') |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
7453 |
| 350 | 7454 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
|
7455 |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
7456 # Switch back to the original log level |
| 350 | 7457 DoPut(_REMOTE, '/tools/log-level-http', original) |
| 7458 | |
| 7459 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
|
7460 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
|
7461 |
|
698898a93a10
test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
348
diff
changeset
|
7462 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/log-level-nope', 'default')) |
| 357 | 7463 |
| 7464 | |
| 7465 def test_upload_zip(self): | |
| 7466 f = StringIO() | |
| 7467 with zipfile.ZipFile(f, 'w') as z: | |
| 7468 z.writestr('hello/world/invalid.txt', 'Hello world') | |
| 7469 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as g: | |
| 7470 c = g.read() | |
| 7471 z.writestr('hello/world/dicom1.dcm', c) | |
| 7472 z.writestr('hello/world/dicom2.dcm', c) | |
| 7473 | |
| 7474 f.seek(0) | |
| 7475 i = DoPost(_REMOTE, '/instances', f.read()) | |
| 7476 | |
| 7477 self.assertEqual(2, len(i)) | |
| 7478 self.assertEqual(i[0], i[1]) | |
| 7479 self.assertEqual(6, len(i[0])) | |
| 7480 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', i[0]['ID']) | |
| 7481 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', i[0]['ParentSeries']) | |
| 7482 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', i[0]['ParentStudy']) | |
| 7483 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', i[0]['ParentPatient']) | |
| 7484 self.assertEqual('/instances/66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', i[0]['Path']) | |
| 7485 | |
| 7486 # Both are "Success" (instead of one "AlreadyStored"), because "OverwriteInstance" is true | |
| 7487 self.assertEqual('Success', i[0]['Status']) | |
|
361
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7488 |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7489 |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7490 def test_transfer_syntax_no_metaheader(self): |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7491 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
|
7492 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % a) |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7493 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
|
7494 |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7495 # This fails on Orthanc <= 1.8.1 |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7496 self.assertTrue('TransferSyntax' in m) |
|
6cf5cc4d0a99
test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
7497 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
|
7498 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7499 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7500 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
|
7501 # 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
|
7502 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7503 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
|
7504 return (('--%s\r\n' + |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7505 '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
|
7506 '\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
|
7507 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7508 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
|
7509 dcm1 = f.read() |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7510 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7511 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
|
7512 dcm2 = f.read() |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7513 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7514 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
|
7515 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7516 boundary = '----WebKitFormBoundarypJDNQqJPoXiorRmQ' |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7517 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
|
7518 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
|
7519 '--' + boundary + '--'), headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7520 '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
|
7521 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7522 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7523 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7524 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
|
7525 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7526 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7527 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
|
7528 # 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
|
7529 # 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
|
7530 # "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
|
7531 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7532 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
|
7533 return (('--%s\r\n' + |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7534 '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
|
7535 '\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
|
7536 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7537 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
|
7538 dcm = f.read() |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7539 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7540 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
|
7541 dcm2 = f.read() |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7542 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7543 boundary = '----WebKitFormBoundarypJDNQqJPoXiorRmQ' |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7544 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7545 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
|
7546 m = DoPost(_REMOTE, '/instances', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7547 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
|
7548 headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7549 '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
|
7550 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7551 '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
|
7552 '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
|
7553 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7554 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7555 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
|
7556 m = DoPost(_REMOTE, '/instances', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7557 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
|
7558 headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7559 '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
|
7560 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7561 '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
|
7562 '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
|
7563 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7564 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
|
7565 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7566 m = DoPost(_REMOTE, '/instances', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7567 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
|
7568 headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7569 '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
|
7570 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7571 '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
|
7572 '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
|
7573 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7574 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7575 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
|
7576 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7577 # 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
|
7578 m = DoPost(_REMOTE, '/instances', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7579 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
|
7580 headers = { |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7581 '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
|
7582 'X-Requested-With' : 'XMLHttpRequest', |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7583 '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
|
7584 '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
|
7585 }) |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7586 |
|
2cc40121c3a8
test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
7587 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
377
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7588 |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7589 |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7590 def test_pixel_data_offset(self): |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7591 # New in Orthanc 1.9.1 |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7592 def Check(path, offset): |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7593 i = UploadInstance(_REMOTE, path) ['ID'] |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7594 metadata = DoGetRaw(_REMOTE, '/instances/%s/metadata/PixelDataOffset' % i) [1] |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7595 self.assertEqual(offset, metadata) |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7596 |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7597 Check('ColorTestMalaterre.dcm', str(0x03a0)) |
|
cc79fa4945da
test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
374
diff
changeset
|
7598 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
|
7599 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
|
7600 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
|
7601 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
|
7602 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
|
7603 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
|
7604 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
|
7605 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
|
7606 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
|
7607 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
|
7608 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
|
7609 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
|
7610 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7611 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7612 def test_peer_store_straight(self): |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7613 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports'])) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7614 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7615 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7616 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
|
7617 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
|
7618 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
|
7619 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
|
7620 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
|
7621 self.assertEqual('0.8.6', peer['Version']) |
|
382
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7622 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7623 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f: |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7624 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
|
7625 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7626 # 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
|
7627 # "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
|
7628 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
|
7629 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
|
7630 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
|
7631 self.assertEqual(6, len(j)) |
|
382
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7632 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
|
7633 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
|
7634 self.assertEqual('Success', j['Status']) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7635 |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7636 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) |
|
a8dd562943a7
added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
380
diff
changeset
|
7637 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
| 383 | 7638 |
| 7639 | |
| 7640 def test_cp246(self): | |
| 7641 # This fails on Orthanc <= 1.9.0 | |
| 7642 a = UploadInstance(_REMOTE, '2021-02-19-MalaterreCP246.dcm')['ID'] | |
| 7643 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 7644 | |
| 7645 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % a) | |
| 7646 self.assertEqual('1.2.840.10008.5.1.4.1.1.128', tags['0008,0016']) | |
| 7647 self.assertEqual('1.3.12.2.1107.5.1.4.36085.2.0.517715415141633', tags['0008,0018']) | |
| 7648 self.assertEqual('1.2.840.113745.101000.1008000.38179.6792.6324567', tags['0020,000d']) | |
| 7649 self.assertEqual('1.3.12.2.1107.5.1.4.36085.2.0.517714246252254', tags['0020,000e']) | |
| 7650 | |
| 7651 study = DoGet(_REMOTE, '/instances/%s/study' % a) | |
| 7652 self.assertEqual(tags['0020,000d'], study['MainDicomTags']['StudyInstanceUID']) | |
| 7653 | |
| 7654 series = DoGet(_REMOTE, '/instances/%s/series' % a) | |
| 7655 self.assertEqual(tags['0020,000e'], series['MainDicomTags']['SeriesInstanceUID']) | |
| 7656 | |
| 7657 instance = DoGet(_REMOTE, '/instances/%s' % a) | |
| 7658 self.assertEqual(tags['0008,0018'], instance['MainDicomTags']['SOPInstanceUID']) | |
| 7659 | |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7660 |
|
392
5cbcb4a83b41
fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
391
diff
changeset
|
7661 def test_revisions_metadata(self): |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7662 # 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
|
7663 # 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
|
7664 # "CheckRevisions" is "False". Conventions for HTTP headers |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7665 # related to revisions mimic CouchDB: |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7666 # 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
|
7667 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7668 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7669 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7670 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
|
7671 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
|
7672 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
|
7673 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7674 (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
|
7675 '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
|
7676 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7677 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
|
7678 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7679 (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
|
7680 '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
|
7681 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7682 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
|
7683 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7684 (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
|
7685 'If-None-Match' : '"0-16de4d7060d0b9d102ef0fca8acc892a"' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7686 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7687 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
|
7688 self.assertEqual('"0-16de4d7060d0b9d102ef0fca8acc892a"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7689 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
|
7690 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7691 (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
|
7692 '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
|
7693 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7694 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
|
7695 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
|
7696 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
|
7697 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7698 (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
|
7699 '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
|
7700 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7701 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
|
7702 self.assertEqual('"0-16de4d7060d0b9d102ef0fca8acc892a"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7703 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
|
7704 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7705 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7706 self.assertEqual('403', headers['status']) # Forbidden (system metadata) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7707 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7708 (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
|
7709 self.assertEqual('403', headers['status']) # Forbidden (system metadata) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7710 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7711 (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
|
7712 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
|
7713 self.assertEqual('"0-%s"' % ComputeMD5('hello'), headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7714 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7715 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7716 self.assertEqual('200', headers['status']) |
|
397
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7717 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7718 self.assertEqual('hello', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7719 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7720 (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
|
7721 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7722 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7723 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
|
7724 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7725 self.assertEqual('', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7726 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7727 (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
|
7728 'If-None-Match' : '"1-tata"' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7729 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7730 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
|
7731 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7732 self.assertEqual('hello', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7733 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
|
7734 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7735 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/1024' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7736 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
|
7737 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7738 (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
|
7739 'If-Match' : '45-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7740 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7741 self.assertEqual('409', headers['status']) # Conflict, as bad revision |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7742 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7743 (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
|
7744 '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
|
7745 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7746 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
|
7747 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7748 (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
|
7749 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7750 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7751 self.assertEqual('200', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7752 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7753 (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
|
7754 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7755 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7756 self.assertEqual('404', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7757 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7758 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7759 self.assertEqual('404', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7760 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7761 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
|
7762 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7763 (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
|
7764 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
|
7765 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7766 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7767 (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
|
7768 self.assertEqual('409', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7769 |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7770 (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
|
7771 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7772 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7773 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
|
7774 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7775 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
|
7776 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7777 (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
|
7778 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7779 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7780 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
|
7781 self.assertEqual('"1-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7782 self.assertEqual('', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7783 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7784 (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
|
7785 'If-None-Match' : headers['etag'] |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7786 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7787 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7788 if headers['status'] == '200': |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7789 print("Your database backend doesn't store revisions") |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7790 (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
|
7791 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7792 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7793 self.assertEqual('409', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7794 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7795 (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
|
7796 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7797 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7798 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
|
7799 self.assertEqual('"1-6e809cbda0732ac4845916a59016f954"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7800 self.assertEqual('', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7801 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7802 elif headers['status'] == '304': # Revisions are supported |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7803 (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
|
7804 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7805 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7806 self.assertEqual('409', headers['status']) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7807 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7808 (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
|
7809 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592' |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7810 }) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7811 self.assertEqual('200', headers['status']) |
|
397
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7812 self.assertEqual('"2-6e809cbda0732ac4845916a59016f954"', headers['etag']) |
|
391
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7813 self.assertEqual('', body) |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7814 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7815 else: |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7816 raise Exception('Internal error') |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7817 |
|
227d9a932467
testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
390
diff
changeset
|
7818 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
|
7819 |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7820 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7821 def test_revisions_attachments(self): |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7822 # 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
|
7823 # was introduced in 1.9.2), or if configuration option |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7824 # "CheckRevisions" is "False". Conventions for HTTP headers |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7825 # related to revisions mimic CouchDB: |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7826 # https://docs.couchdb.org/en/stable/api/document/common.html |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7827 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7828 |
|
397
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7829 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
|
7830 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
|
7831 |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7832 # "/compress", "/uncompress" and "/verify-md5" are POST |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7833 # methods, and are not affected by revisions |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7834 for suffix in [ '', '/compressed-data', '/compressed-md5', '/compressed-size', |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7835 '/data', '/is-compressed', '/md5', '/size' ]: |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7836 (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
|
7837 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
|
7838 self.assertEqual('"0-%s"' % md5, headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7839 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7840 (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
|
7841 'If-None-Match' : '"0-3e29b869978b6db4886355a2b1132124"', |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7842 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7843 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
|
7844 self.assertEqual('"0-3e29b869978b6db4886355a2b1132124"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7845 self.assertEqual('', body) # Body must be empty on 304 status |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7846 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7847 (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
|
7848 '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
|
7849 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7850 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
|
7851 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7852 (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
|
7853 '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
|
7854 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7855 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
|
7856 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
|
7857 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7858 (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
|
7859 '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
|
7860 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7861 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
|
7862 self.assertEqual('"0-3e29b869978b6db4886355a2b1132124"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7863 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7864 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/dicom' % i) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7865 self.assertEqual('403', headers['status']) # Forbidden (system metadata) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7866 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7867 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/dicom' % i, 'hello') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7868 self.assertEqual('403', headers['status']) # Forbidden (system metadata) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7869 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7870 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7871 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
|
7872 self.assertEqual('"0-%s"' % ComputeMD5('hello'), headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7873 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7874 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7875 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
|
7876 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7877 self.assertEqual('hello', body) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7878 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7879 (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
|
7880 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7881 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7882 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
|
7883 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7884 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
|
7885 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7886 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
|
7887 '"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
|
7888 (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
|
7889 '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
|
7890 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7891 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
|
7892 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
|
7893 self.assertEqual('hello', body) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7894 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7895 (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
|
7896 'If-None-Match' : 'tata' # Bad header format |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7897 }) |
|
397
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7898 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
|
7899 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
|
7900 |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7901 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
|
7902 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7903 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/1024' % i) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7904 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
|
7905 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7906 (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
|
7907 'If-Match' : '45-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7908 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7909 self.assertEqual('409', headers['status']) # Conflict, as bad revision |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7910 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7911 (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
|
7912 '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
|
7913 }) |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7914 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
|
7915 |
|
eb87ec525b53
"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
7916 (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
|
7917 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7918 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7919 self.assertEqual('200', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7920 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7921 (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
|
7922 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7923 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7924 self.assertEqual('404', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7925 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7926 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7927 self.assertEqual('404', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7928 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7929 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
|
7930 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7931 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7932 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
|
7933 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7934 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7935 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7936 self.assertEqual('409', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7937 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7938 (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
|
7939 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7940 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7941 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
|
7942 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7943 self.assertEqual('', body) # Body must be empty on 304 status |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7944 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7945 (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
|
7946 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7947 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7948 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
|
7949 self.assertEqual('"1-5d41402abc4b2a76b9719d911017c592"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7950 self.assertEqual('{}', body) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7951 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7952 (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
|
7953 'If-None-Match' : headers['etag'] |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7954 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7955 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7956 if headers['status'] == '200': |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7957 print("Your database backend doesn't store revisions") |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7958 (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
|
7959 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7960 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7961 self.assertEqual('409', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7962 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7963 (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
|
7964 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7965 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7966 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
|
7967 self.assertEqual('"1-6e809cbda0732ac4845916a59016f954"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7968 self.assertEqual('{}', body) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7969 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7970 elif headers['status'] == '304': # Revisions are supported |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7971 (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
|
7972 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7973 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7974 self.assertEqual('409', headers['status']) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7975 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7976 (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
|
7977 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592' |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7978 }) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7979 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
|
7980 self.assertEqual('"2-6e809cbda0732ac4845916a59016f954"', headers['etag']) |
|
393
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7981 self.assertEqual('{}', body) |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7982 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7983 else: |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7984 raise Exception('Internal error') |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7985 |
|
3019306499c5
test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
7986 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
|
7987 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7988 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7989 def test_issue_195(self): |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7990 # This fails on Orthanc <= 1.9.2 |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
7991 # https://bugs.orthanc-server.com/show_bug.cgi?id=195 |
|
399
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7992 a = UploadInstance(_REMOTE, 'Issue195.dcm')['ID'] |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7993 b = DoGet(_REMOTE, '/instances/%s/file' % a, |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7994 headers = { 'Accept' : 'application/dicom+json' }) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7995 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7996 # 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
|
7997 self.assertEqual(5, len(b)) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7998 self.assertEqual(2, len(b["00080018"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
7999 self.assertEqual("UI", b["00080018"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8000 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
|
8001 b["00080018"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8002 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8003 self.assertEqual(2, len(b["0020000D"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8004 self.assertEqual("UI", b["0020000D"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8005 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
|
8006 b["0020000D"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8007 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8008 self.assertEqual(2, len(b["0020000E"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8009 self.assertEqual("UI", b["0020000E"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8010 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
|
8011 b["0020000E"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8012 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8013 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
|
8014 self.assertEqual("LO", b["00081030"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8015 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8016 self.assertEqual(2, len(b["0008103E"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8017 self.assertEqual("LO", b["0008103E"]["vr"]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8018 self.assertEqual("Hello1", b["0008103E"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8019 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8020 a = UploadInstance(_REMOTE, 'Issue195-bis.dcm')['ID'] |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8021 b = DoGet(_REMOTE, '/instances/%s/file' % a, |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8022 headers = { 'Accept' : 'application/dicom+json' }) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8023 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8024 # 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
|
8025 self.assertEqual(5, len(b)) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8026 self.assertEqual(2, len(b["00080018"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8027 self.assertEqual("UI", b["00080018"]["vr"]) |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8028 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
|
8029 b["00080018"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8030 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8031 self.assertEqual(2, len(b["0020000D"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8032 self.assertEqual("UI", b["0020000D"]["vr"]) |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8033 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
|
8034 b["0020000D"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8035 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8036 self.assertEqual(2, len(b["0020000E"])) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8037 self.assertEqual("UI", b["0020000E"]["vr"]) |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8038 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
|
8039 b["0020000E"]["Value"][0]) |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8040 |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8041 self.assertEqual(2, len(b["00084567"])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8042 self.assertEqual("UN", b["00084567"]["vr"]) |
|
399
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8043 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8044 # 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
|
8045 # $ echo -n 'QgA=' | base64 -d | hexdump -C |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8046 self.assertEqual("QgA=", b["00084567"]["InlineBinary"]) |
|
399
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8047 |
|
dd519677974d
integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
397
diff
changeset
|
8048 # 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
|
8049 self.assertEqual(1, len(b["00084565"])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8050 self.assertEqual("UN", b["00084565"]["vr"]) |
|
402
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8051 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8052 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8053 def test_modify_attribute(self): |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8054 # This fails on Orthanc <= 1.9.3 (not implemented) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8055 # 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
|
8056 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8057 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8058 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % i) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8059 self.assertFalse('0020,9165' in tags) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8060 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8061 i = DoPost(_REMOTE, '/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0/modify', { |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8062 "Replace": { |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8063 "0020,9165": "0020,9056", |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8064 } |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8065 }) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8066 instances = DoGet(_REMOTE, '/studies/%s/instances' % i['ID']) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8067 self.assertEqual(1, len(instances)) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8068 |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8069 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % instances[0]['ID']) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8070 self.assertTrue('0020,9165' in tags) |
|
cc947ddc57c5
test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
8071 self.assertEqual('0020,9056', tags['0020,9165']) |
| 405 | 8072 |
| 8073 | |
| 8074 def test_issue_146(self): | |
| 8075 # "Update Anonyization to 2019c" | |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
8076 # https://bugs.orthanc-server.com/show_bug.cgi?id=146 |
| 405 | 8077 |
| 8078 def GetTags(study, params): | |
| 8079 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, params) ['ID'] | |
| 8080 b = DoGet(_REMOTE, '/studies/%s/instances' % a) | |
| 8081 self.assertEqual(1, len(b)) | |
| 8082 return DoGet(_REMOTE, '/instances/%s/tags?short' % b[0]['ID']) | |
| 8083 | |
| 8084 | |
| 8085 UploadInstance(_REMOTE, 'Issue146.dcm') | |
| 8086 study = '7c950970-321e4ab0-28446c5f-f94850f1-5c44634b' | |
| 8087 | |
| 8088 self.assertRaises(Exception, lambda: GetTags(study, { 'DicomVersion' : 'nope' })) | |
| 8089 | |
| 8090 tags2008 = GetTags(study, { 'DicomVersion' : '2008' }) | |
| 8091 tags2017c = GetTags(study, { 'DicomVersion' : '2017c' }) | |
| 8092 tags2021b = GetTags(study, { 'DicomVersion' : '2021b' }) | |
|
557
1cdb14a679f2
fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
556
diff
changeset
|
8093 tags2023b = GetTags(study, { 'DicomVersion' : '2023b' }) |
| 405 | 8094 tagsDefault = GetTags(study, {}) |
| 8095 | |
| 420 | 8096 orthancVersion = DoGet(_REMOTE, '/system') ['Version'] |
| 709 | 8097 if orthancVersion.startswith('mainline-'): # happens in unstable orthancteam/orthanc images |
| 708 | 8098 orthancVersion = 'mainline' |
| 8099 | |
| 420 | 8100 self.assertEqual('Orthanc %s - PS 3.15-2008 Table E.1-1' % orthancVersion, tags2008['0012,0063']) |
| 8101 self.assertEqual('Orthanc %s - PS 3.15-2017c Table E.1-1 Basic Profile' % orthancVersion, tags2017c['0012,0063']) | |
| 8102 self.assertEqual('Orthanc %s - PS 3.15-2021b Table E.1-1 Basic Profile' % orthancVersion, tags2021b['0012,0063']) | |
|
557
1cdb14a679f2
fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
556
diff
changeset
|
8103 self.assertEqual('Orthanc %s - PS 3.15-2023b Table E.1-1 Basic Profile' % orthancVersion, tags2023b['0012,0063']) |
|
1cdb14a679f2
fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
556
diff
changeset
|
8104 self.assertEqual(tagsDefault['0012,0063'], tags2023b['0012,0063']) |
|
1cdb14a679f2
fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
556
diff
changeset
|
8105 |
|
1cdb14a679f2
fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
556
diff
changeset
|
8106 self.assertEqual(len(tags2021b), len(tags2023b)) |
|
1cdb14a679f2
fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
556
diff
changeset
|
8107 self.assertNotEqual(tags2021b, tags2023b) |
|
1cdb14a679f2
fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
556
diff
changeset
|
8108 |
|
1cdb14a679f2
fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
556
diff
changeset
|
8109 for t in [ tags2008, tags2017c, tags2021b, tags2023b, tagsDefault ]: |
| 405 | 8110 self.assertTrue(t['0010,0010'].startswith('Anonymized')) |
| 8111 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', t['0008,0016']) | |
| 8112 self.assertEqual(36, len(t['0010,0020'])) # Length of a UUID | |
| 8113 self.assertEqual('YES', t['0012,0062']) | |
| 8114 | |
| 8115 for t in [ tags2008 ]: | |
| 8116 self.assertEqual('20200101', t['0008,0020']) | |
| 8117 | |
|
557
1cdb14a679f2
fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
556
diff
changeset
|
8118 for t in [ tags2017c, tags2021b, tags2023b, tagsDefault ]: |
| 405 | 8119 self.assertEqual('', t['0008,0020']) # Study Date, anonymized between 2008 and 2017c |
| 8120 | |
| 8121 for t in [ tags2008, tags2017c ]: | |
| 8122 self.assertEqual('HELLO^C', t['0050,0020']) | |
| 8123 self.assertEqual('HELLO^D', t['3006,0002']) | |
| 8124 | |
|
557
1cdb14a679f2
fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
556
diff
changeset
|
8125 for t in [ tags2021b, tags2023b, tagsDefault ]: |
| 405 | 8126 self.assertFalse('0050,0020' in t) # Device Description, anonymized between 2017c and 2019c |
| 8127 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
|
8128 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8129 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8130 def test_anonymize_relationships_6(self): |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8131 # 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
|
8132 # 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
|
8133 # sequence containing StudyUID / Series UID of related series. |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8134 # [After anonymization,] this tag keep a reference of the |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8135 # original Study/Series UID. |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8136 # 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
|
8137 UploadInstance(_REMOTE, '2020-11-16-SalimKanounAnonymization.dcm') |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8138 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8139 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
|
8140 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
|
8141 tags['0008,1250'][0]['0020,000d']) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8142 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
|
8143 tags['0008,1250'][0]['0020,000e']) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8144 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8145 a = DoGet(_REMOTE, '/studies') |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8146 self.assertEqual(1, len(a)) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8147 b = DoPost(_REMOTE, '/studies/%s/anonymize' % a[0], {}) ['ID'] |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8148 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8149 c = DoGet(_REMOTE, '/studies/%s/instances' % b) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8150 self.assertEqual(1, len(c)) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8151 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
|
8152 |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8153 # 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
|
8154 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
|
8155 tags['0008,1250'][0]['0020,000d']) |
|
62ee5e57ee05
test_anonymize_relationships_6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
405
diff
changeset
|
8156 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
|
8157 tags['0008,1250'][0]['0020,000e']) |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8158 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8159 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8160 def test_modify_subsequences(self): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8161 # New in Orthanc 1.9.4 (cf. LSD-629) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8162 UploadInstance(_REMOTE, 'Issue22-NoPixelData.dcm') |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8163 studies = DoGet(_REMOTE, '/studies') |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8164 self.assertEqual(1, len(studies)) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8165 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8166 def GetTags(study): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8167 instances = DoGet(_REMOTE, '/studies/%s/instances' % study) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8168 self.assertEqual(1, len(instances)) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8169 return DoGet(_REMOTE, '/instances/%s/tags?short' % instances[0]['ID']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8170 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8171 tags1 = GetTags(studies[0]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8172 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8173 a = DoPost(_REMOTE, '/studies/%s/modify' % studies[0], { |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8174 'Replace' : { |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8175 'PatientName' : 'Hello1', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8176 'DimensionIndexSequence[1].DimensionDescriptionLabel' : 'Hello2', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8177 'DimensionIndexSequence[*].PatientName' : 'Hello3', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8178 '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
|
8179 'DimensionOrganizationSequence[0].DimensionOrganizationUID' : '1.2.3.4', |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8180 }, |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8181 'Remove' : [ |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8182 'ReferencedPerformedProcedureStepSequence', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8183 'PerformedProtocolCodeSequence[0].CodeValue', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8184 'SharedFunctionalGroupsSequence[*].ReferencedImageSequence[*].ReferencedSOPInstanceUID', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8185 'SharedFunctionalGroupsSequence[*].ReferencedImageSequence[1].ReferencedSOPClassUID', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8186 'SharedFunctionalGroupsSequence[2].ReferencedImageSequence', # Inexistent tag |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8187 ] |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8188 }) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8189 tags2 = GetTags(a['ID']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8190 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8191 self.assertEqual('Anonymized1', tags1['0010,0010']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8192 self.assertEqual('Hello1', tags2['0010,0010']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8193 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8194 self.assertEqual('Stack ID', tags1['0020,9222'][0]['0020,9421']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8195 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
|
8196 self.assertEqual('Stack ID', tags2['0020,9222'][0]['0020,9421']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8197 self.assertEqual('Hello2', tags2['0020,9222'][1]['0020,9421']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8198 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8199 for i in range(3): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8200 self.assertFalse('0010,0010' in tags1['0020,9222'][i]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8201 self.assertEqual('Hello3', tags2['0020,9222'][i]['0010,0010']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8202 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8203 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
|
8204 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
|
8205 self.assertEqual('Hello4', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8206 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
|
8207 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
|
8208 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
|
8209 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8210 self.assertTrue('0008,1111' in tags1) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8211 self.assertFalse('0008,1111' in tags2) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8212 self.assertTrue('0008,0100' in tags1['0040,0260'][0]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8213 self.assertFalse('0008,0100' in tags2['0040,0260'][0]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8214 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8215 for i in range(3): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8216 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
|
8217 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
|
8218 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
|
8219 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8220 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
|
8221 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
|
8222 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
|
8223 |
|
408
4e0b9fddbc71
test "Replace" for UID in subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
8224 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
|
8225 tags1['0020,9221'][0]['0020,9164']) |
|
4e0b9fddbc71
test "Replace" for UID in subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
8226 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
|
8227 |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8228 a = DoPost(_REMOTE, '/studies/%s/anonymize' % studies[0], { |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8229 'Replace' : { |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8230 'DimensionIndexSequence[1].DimensionDescriptionLabel' : 'Hello1', |
|
408
4e0b9fddbc71
test "Replace" for UID in subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
8231 'DimensionOrganizationSequence[0].DimensionOrganizationUID' : '1.2.3.4', |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8232 }, |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8233 'Remove' : [ |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8234 'SharedFunctionalGroupsSequence[*].ReferencedImageSequence[*].ReferencedSOPInstanceUID', # 5200,9229 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8235 ], |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8236 'Keep' : [ |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8237 'ReferencedImageEvidenceSequence', # 0008,9092 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8238 'DimensionIndexSequence', # 0020,9222 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8239 'PerFrameFunctionalGroupsSequence[*].2005,140f[*].SOPInstanceUID', # 5200,9230 |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8240 '(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
|
8241 '(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
|
8242 ], |
|
557
1cdb14a679f2
fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
556
diff
changeset
|
8243 'DicomVersion' : '2021b', |
|
424
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
8244 'KeepPrivateTags' : True # Compatibility with Orthanc 1.9.4 |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8245 }) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8246 tags3 = GetTags(a['ID']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8247 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8248 # UIDs |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8249 for i in [ '0008,0018', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8250 '0010,0020', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8251 '0008,0018', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8252 '0010,0020' ]: |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8253 self.assertNotEqual(tags1[i], tags3[i]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8254 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8255 self.assertNotEqual(tags1['0020,9221'][0]['0020,9164'], |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8256 tags3['0020,9221'][0]['0020,9164']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8257 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8258 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
|
8259 tags3['5200,9229'][0]['2005,140e'][0]['0008,0014']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8260 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8261 # 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
|
8262 # Removals (X) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8263 for i in [ '0008,0021', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8264 '0008,002a', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8265 '0008,0031', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8266 '0008,1030', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8267 '0008,103e', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8268 '0008,1111', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8269 '0010,21c0', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8270 '0040,0006', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8271 '0040,0241', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8272 '0040,0244', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8273 '0040,0245', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8274 '0040,0250', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8275 '0040,0251', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8276 '0040,0253', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8277 '0040,0254', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8278 '0040,0555', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8279 ]: |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8280 self.assertTrue(i in tags1) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8281 self.assertFalse(i in tags3) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8282 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8283 # Clearings (Z) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8284 for i in [ '0008,0020', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8285 '0008,0023', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8286 '0008,0030', |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8287 '0008,0033' ]: |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8288 self.assertNotEqual('', tags1[i]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8289 self.assertEqual('', tags3[i]) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8290 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8291 # Replace |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8292 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
|
8293 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
|
8294 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
|
8295 |
|
407
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8296 # "Keep" on DimensionIndexSequence |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8297 for i in range(3): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8298 self.assertEqual(tags1['0020,9222'][i]['0020,9164'], |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8299 tags3['0020,9222'][i]['0020,9164']) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8300 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8301 # "Keep" on ReferencedImageEvidenceSequence |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8302 self.assertEqual(json.dumps(tags1['0008,9092']), |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8303 json.dumps(tags3['0008,9092'])) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8304 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8305 # "Keep" on PerFrameFunctionalGroupsSequence |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8306 self.assertEqual(json.dumps(tags1['5200,9230']), |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8307 json.dumps(tags3['5200,9230'])) |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8308 |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8309 # "Remove" on SharedFunctionalGroupsSequence |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8310 for i in range(3): |
|
ad98466353c6
test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
406
diff
changeset
|
8311 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
|
8312 self.assertFalse('0008,1155' in tags3['5200,9229'][0]['0008,1140'][i]) |
| 410 | 8313 |
| 8314 | |
| 8315 def test_bulk_modify(self): | |
| 8316 # New in Orthanc 1.9.4 | |
| 8317 | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8318 def GetModified(lst, resourceType, expectedCount = None): |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8319 m = map(lambda x: x['ID'], filter(lambda x: x['Type'] == resourceType, lst['Resources'])) |
| 410 | 8320 if expectedCount != None: |
| 8321 self.assertEqual(expectedCount, len(m)) | |
| 8322 return m | |
| 8323 | |
| 8324 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] | |
| 8325 series = DoGet(_REMOTE, '/series') [0] | |
| 8326 study = DoGet(_REMOTE, '/studies') [0] | |
| 8327 patient = DoGet(_REMOTE, '/patients') [0] | |
| 8328 | |
| 8329 a = DoPost(_REMOTE, '/tools/bulk-modify', { | |
| 8330 'Resources' : [ instance ] | |
| 8331 }) | |
| 8332 | |
| 8333 self.assertNotEqual(instance, GetModified(a, 'Instance', 1) [0]) | |
| 8334 self.assertEqual(series, GetModified(a, 'Series', 1) [0]) | |
| 8335 self.assertEqual(study, GetModified(a, 'Study', 1) [0]) | |
| 8336 self.assertEqual(patient, GetModified(a, 'Patient', 1) [0]) | |
| 8337 | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8338 b = DoPost(_REMOTE, '/tools/bulk-anonymize', { |
| 410 | 8339 'Resources' : [ instance ] |
| 8340 }) | |
| 8341 | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8342 self.assertNotEqual(instance, GetModified(b, 'Instance', 1) [0]) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8343 self.assertNotEqual(series, GetModified(b, 'Series', 1) [0]) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8344 self.assertNotEqual(study, GetModified(b, 'Study', 1) [0]) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8345 self.assertNotEqual(patient, GetModified(b, 'Patient', 1) [0]) |
| 410 | 8346 |
| 8347 self.assertEqual(3, len(DoGet(_REMOTE, '/instances'))) | |
| 8348 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 8349 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) | |
| 8350 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8351 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8352 DoPost(_REMOTE, '/tools/bulk-delete', { |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8353 'Resources' : GetModified(b, 'Patient', 1) + GetModified(a, 'Instance', 1) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8354 }) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8355 |
| 410 | 8356 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID'] |
| 8357 knee2 = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') ['ID'] | |
| 8358 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID'] | |
| 8359 | |
| 8360 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) | |
| 8361 self.assertEqual(4, len(DoGet(_REMOTE, '/series'))) | |
| 8362 self.assertEqual(3, len(DoGet(_REMOTE, '/studies'))) | |
| 8363 self.assertEqual(3, len(DoGet(_REMOTE, '/patients'))) | |
| 8364 | |
| 8365 a = DoPost(_REMOTE, '/tools/bulk-modify', { | |
| 8366 'Resources' : [ knee1, brainix ] | |
| 8367 }) | |
| 8368 | |
| 8369 self.assertEqual(6, len(DoGet(_REMOTE, '/instances'))) | |
| 8370 self.assertEqual(4, len(DoGet(_REMOTE, '/series'))) | |
| 8371 self.assertEqual(3, len(DoGet(_REMOTE, '/studies'))) | |
| 8372 self.assertEqual(3, len(DoGet(_REMOTE, '/patients'))) | |
| 8373 | |
| 8374 for i in GetModified(a, 'Instance', 2): | |
| 8375 self.assertTrue(not i in [ instance, knee1, knee2, brainix ]) | |
| 8376 self.assertTrue(DoGet(_REMOTE, '/instances/%s/metadata/ModifiedFrom' % i) in [ knee1, brainix ]) | |
| 8377 | |
| 8378 b = GetModified(a, 'Series', 2) | |
| 8379 self.assertTrue(DoGet(_REMOTE, '/instances/%s/series' % knee1) ['ID'] in b) | |
| 8380 self.assertTrue(DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'] in b) | |
| 8381 self.assertFalse(DoGet(_REMOTE, '/instances/%s/series' % knee2) ['ID'] in b) | |
| 8382 self.assertFalse(DoGet(_REMOTE, '/instances/%s/series' % instance) ['ID'] in b) | |
| 8383 | |
| 8384 b = GetModified(a, 'Study', 2) | |
| 8385 self.assertTrue(DoGet(_REMOTE, '/instances/%s/study' % knee1) ['ID'] in b) | |
| 8386 self.assertTrue(DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID'] in b) | |
| 8387 self.assertTrue(DoGet(_REMOTE, '/instances/%s/study' % knee2) ['ID'] in b) | |
| 8388 self.assertFalse(DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] in b) | |
| 8389 | |
| 8390 b = GetModified(a, 'Patient', 2) | |
| 8391 self.assertTrue(DoGet(_REMOTE, '/instances/%s/patient' % knee1) ['ID'] in b) | |
| 8392 self.assertTrue(DoGet(_REMOTE, '/instances/%s/patient' % brainix) ['ID'] in b) | |
| 8393 self.assertTrue(DoGet(_REMOTE, '/instances/%s/patient' % knee2) ['ID'] in b) | |
| 8394 self.assertFalse(DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] in b) | |
| 8395 | |
|
411
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8396 DoPost(_REMOTE, '/tools/bulk-delete', { |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8397 'Resources' : GetModified(a, 'Instance', 2) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8398 }) |
| 410 | 8399 |
| 8400 sourceInstances = DoGet(_REMOTE, '/instances') | |
| 8401 sourceSeries = DoGet(_REMOTE, '/series') | |
| 8402 sourceStudies = DoGet(_REMOTE, '/studies') | |
| 8403 sourcePatients = DoGet(_REMOTE, '/patients') | |
| 8404 self.assertEqual(4, len(sourceInstances)) | |
| 8405 self.assertEqual(4, len(sourceSeries)) | |
| 8406 self.assertEqual(3, len(sourceStudies)) | |
| 8407 self.assertEqual(3, len(sourcePatients)) | |
| 8408 | |
| 8409 a = DoPost(_REMOTE, '/tools/bulk-anonymize', { | |
| 8410 'Resources' : [ knee1, brainix ] | |
| 8411 }) | |
| 8412 | |
| 8413 self.assertEqual(6, len(DoGet(_REMOTE, '/instances'))) | |
| 8414 self.assertEqual(6, len(DoGet(_REMOTE, '/series'))) | |
| 8415 self.assertEqual(5, len(DoGet(_REMOTE, '/studies'))) | |
| 8416 self.assertEqual(5, len(DoGet(_REMOTE, '/patients'))) | |
| 8417 | |
| 8418 for i in GetModified(a, 'Instance', 2): | |
| 8419 self.assertFalse(i in sourceInstances) | |
| 8420 self.assertTrue(DoGet(_REMOTE, '/instances/%s/metadata/AnonymizedFrom' % i) in [ knee1, brainix ]) | |
| 8421 | |
| 8422 for i in GetModified(a, 'Series', 2): | |
| 8423 self.assertFalse(i in sourceSeries) | |
| 8424 self.assertTrue(DoGet(_REMOTE, '/series/%s/metadata/AnonymizedFrom' % i) in sourceSeries) | |
| 8425 | |
| 8426 for i in GetModified(a, 'Study', 2): | |
| 8427 self.assertFalse(i in sourceStudies) | |
| 8428 self.assertTrue(DoGet(_REMOTE, '/studies/%s/metadata/AnonymizedFrom' % i) in sourceStudies) | |
| 8429 | |
| 8430 for i in GetModified(a, 'Patient', 2): | |
| 8431 self.assertFalse(i in sourcePatients) | |
| 8432 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
|
8433 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8434 DoPost(_REMOTE, '/tools/bulk-delete', { |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8435 'Resources' : GetModified(a, 'Patient', 2) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8436 }) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8437 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8438 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8439 self.assertEqual(4, len(DoGet(_REMOTE, '/series'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8440 self.assertEqual(3, len(DoGet(_REMOTE, '/studies'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8441 self.assertEqual(3, len(DoGet(_REMOTE, '/patients'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8442 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8443 DoPost(_REMOTE, '/tools/bulk-delete', { |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8444 'Resources' : [ instance, |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8445 DoGet(_REMOTE, '/instances/%s/patient' % knee1) ['ID'], |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8446 DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'] ] |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8447 }) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8448 |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8449 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8450 self.assertEqual(0, len(DoGet(_REMOTE, '/series'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8451 self.assertEqual(0, len(DoGet(_REMOTE, '/studies'))) |
|
8cf866641fa7
testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
410
diff
changeset
|
8452 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
412
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8453 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8454 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8455 def test_dicom_to_json_format(self): |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8456 # 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
|
8457 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8458 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8459 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8460 series = DoGet(_REMOTE, '/instances/%s/series' % instance) ['ID'] |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8461 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8462 self.assertEqual('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
|
8463 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
|
8464 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
|
8465 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
|
8466 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
|
8467 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
|
8468 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8469 # Test "GetInstanceHeader()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8470 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
|
8471 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
|
8472 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
|
8473 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
|
8474 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
|
8475 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
|
8476 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8477 # Test "ListResources()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8478 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
|
8479 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
|
8480 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
|
8481 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
|
8482 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8483 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
|
8484 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
|
8485 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
|
8486 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
|
8487 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8488 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
|
8489 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
|
8490 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
|
8491 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
|
8492 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8493 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
|
8494 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
|
8495 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
|
8496 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
|
8497 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8498 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
|
8499 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
|
8500 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
|
8501 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
|
8502 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8503 # Test "GetSingleResource()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8504 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
|
8505 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
|
8506 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
|
8507 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
|
8508 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8509 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
|
8510 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
|
8511 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
|
8512 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
|
8513 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8514 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
|
8515 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
|
8516 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
|
8517 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
|
8518 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8519 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
|
8520 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
|
8521 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
|
8522 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
|
8523 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8524 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
|
8525 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
|
8526 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
|
8527 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
|
8528 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8529 # Test "Find()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8530 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
|
8531 self.assertEqual('20070101', a[0]['MainDicomTags']['StudyDate']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8532 self.assertEqual('KNIX', a[0]['PatientMainDicomTags']['PatientName']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8533 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8534 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
|
8535 self.assertEqual('20070101', a[0]['MainDicomTags']['0008,0020']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8536 self.assertEqual('KNIX', a[0]['PatientMainDicomTags']['0010,0010']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8537 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8538 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
|
8539 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
|
8540 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
|
8541 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
|
8542 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
|
8543 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8544 # Test "GetChildResources()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8545 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
|
8546 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
|
8547 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
|
8548 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
|
8549 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8550 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
|
8551 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
|
8552 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
|
8553 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
|
8554 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8555 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
|
8556 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
|
8557 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
|
8558 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
|
8559 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8560 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
|
8561 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
|
8562 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
|
8563 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
|
8564 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8565 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
|
8566 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
|
8567 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
|
8568 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
|
8569 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8570 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
|
8571 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
|
8572 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
|
8573 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
|
8574 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8575 # Test "GetParentResource()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8576 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
|
8577 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
|
8578 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
|
8579 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
|
8580 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8581 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
|
8582 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
|
8583 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
|
8584 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
|
8585 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8586 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
|
8587 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
|
8588 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
|
8589 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
|
8590 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8591 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
|
8592 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
|
8593 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
|
8594 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
|
8595 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8596 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
|
8597 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
|
8598 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
|
8599 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
|
8600 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8601 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
|
8602 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
|
8603 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
|
8604 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
|
8605 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8606 # Test "GetChildInstancesTags()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8607 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
|
8608 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
|
8609 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
|
8610 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
|
8611 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8612 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
|
8613 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
|
8614 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
|
8615 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
|
8616 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8617 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
|
8618 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
|
8619 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
|
8620 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
|
8621 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8622 # Test "GetSharedTags()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8623 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
|
8624 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
|
8625 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
|
8626 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
|
8627 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8628 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
|
8629 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
|
8630 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
|
8631 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
|
8632 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8633 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
|
8634 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
|
8635 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
|
8636 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
|
8637 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8638 # Test "GetModule()" in "OrthancRestResources.cpp" |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8639 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
|
8640 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
|
8641 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
|
8642 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8643 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
|
8644 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
|
8645 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
|
8646 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8647 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
|
8648 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
|
8649 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
|
8650 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8651 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
|
8652 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
|
8653 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
|
8654 |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8655 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
|
8656 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
|
8657 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
|
8658 DoGet(_REMOTE, '/instances/%s/module?simplify' % instance) ['SOPInstanceUID']) |
|
cd9da28451cc
test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
411
diff
changeset
|
8659 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
|
8660 DoGet(_REMOTE, '/instances/%s/module?short' % instance) ['0008,0018']) |
| 413 | 8661 |
| 8662 # Test "ListQueryAnswers()" in "OrthancRestModalities.cpp" | |
| 8663 a = DoPost(_REMOTE, '/modalities/self/query', { 'Level' : 'Study', | |
| 8664 'Query' : { 'PatientID' : '*' }}) ['ID'] | |
| 8665 | |
| 8666 self.assertEqual(1, len(DoGet(_REMOTE, '/queries/%s/answers' % a))) | |
| 8667 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand' % a) [0]['0010,0020']['Value']) | |
| 8668 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/answers?expand' % a) [0]['0010,0020']['Name']) | |
| 8669 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) [0]['PatientID']) | |
| 8670 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand&short' % a) [0]['0010,0020']) | |
| 8671 | |
| 8672 # Test "GetQueryOneAnswer()" in "OrthancRestModalities.cpp" | |
| 8673 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content' % a) ['0010,0020']['Value']) | |
| 8674 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/answers/0/content' % a) ['0010,0020']['Name']) | |
| 8675 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content?simplify' % a) ['PatientID']) | |
| 8676 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content?short' % a) ['0010,0020']) | |
| 8677 | |
| 8678 # Test "GetQueryArguments()" in "OrthancRestModalities.cpp" | |
| 8679 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query' % a) ['0010,0020']['Value']) | |
| 8680 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/query' % a) ['0010,0020']['Name']) | |
| 8681 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query?simplify' % a) ['PatientID']) | |
| 8682 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query?short' % a) ['0010,0020']) | |
| 8683 | |
|
414
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8684 # Test "BulkContent()" in "OrthancRestResources.cpp" |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8685 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
|
8686 self.assertEqual(4, len(a)) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8687 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['PatientID']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8688 self.assertEqual('Knee (R)', a[1]['MainDicomTags']['StudyDescription']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8689 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['PatientName']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8690 self.assertEqual('AX. FSE PD', a[2]['MainDicomTags']['SeriesDescription']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8691 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
|
8692 a[3]['MainDicomTags']['SOPInstanceUID']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8693 |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8694 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
|
8695 'Short': True }) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8696 self.assertEqual(4, len(a)) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8697 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['0010,0020']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8698 self.assertEqual('Knee (R)', a[1]['MainDicomTags']['0008,1030']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8699 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['0010,0010']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8700 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
|
8701 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
|
8702 a[3]['MainDicomTags']['0008,0018']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8703 |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8704 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
|
8705 'Full': True }) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8706 self.assertEqual(4, len(a)) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8707 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['0010,0020']['Value']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8708 self.assertEqual('PatientID', a[0]['MainDicomTags']['0010,0020']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8709 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
|
8710 self.assertEqual('StudyDescription', a[1]['MainDicomTags']['0008,1030']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8711 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['0010,0010']['Value']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8712 self.assertEqual('PatientName', a[1]['PatientMainDicomTags']['0010,0010']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8713 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
|
8714 self.assertEqual('SeriesDescription', a[2]['MainDicomTags']['0008,103e']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8715 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
|
8716 a[3]['MainDicomTags']['0008,0018']['Value']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8717 self.assertEqual('SOPInstanceUID', a[3]['MainDicomTags']['0008,0018']['Name']) |
|
a2beea45a53d
test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
8718 |
| 415 | 8719 |
| 8720 def test_bulk_content(self): | |
| 8721 # New in Orthanc 1.9.4 | |
| 8722 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID'] | |
| 8723 knee2 = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') ['ID'] | |
| 8724 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID'] | |
| 8725 | |
| 8726 brainixHierarchy = [ | |
| 8727 DoGet(_REMOTE, '/instances/%s/patient' % brainix) ['ID'], | |
| 8728 DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID'], | |
| 8729 DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'], | |
| 8730 brainix, | |
| 8731 ] | |
| 8732 | |
| 8733 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : brainixHierarchy }) | |
| 8734 self.assertEqual(4, len(a)) | |
| 8735 b = map(lambda x: x['ID'], a) | |
| 8736 for i in range(4): | |
| 8737 self.assertEqual(brainixHierarchy[i], b[i]) | |
|
418
8a3d67a40083
test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
417
diff
changeset
|
8738 self.assertTrue('Metadata' in a[i]) |
| 415 | 8739 |
| 8740 for (level, index) in [ | |
| 8741 ('Patient', 0), | |
| 8742 ('Study', 1), | |
| 8743 ('Series', 2), | |
| 8744 ('Instance', 3), | |
| 8745 ]: | |
| 8746 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : brainixHierarchy, | |
| 8747 'Level' : level }) | |
| 8748 self.assertEqual(1, len(a)) | |
| 8749 self.assertEqual(level, a[0]['Type']) | |
| 8750 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
|
8751 self.assertTrue('Metadata' in a[0]) |
| 415 | 8752 |
| 8753 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
|
8754 'Level' : level, |
|
8a3d67a40083
test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
417
diff
changeset
|
8755 'Metadata' : False }) |
| 415 | 8756 self.assertEqual(1, len(a)) |
| 8757 self.assertEqual(level, a[0]['Type']) | |
| 8758 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
|
8759 self.assertFalse('Metadata' in a[0]) |
| 415 | 8760 |
| 8761 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, knee2, brainix ] }) | |
| 8762 self.assertEqual(3, len(a)) | |
| 8763 for item in a: | |
| 8764 self.assertEqual('Instance', item['Type']) | |
| 8765 b = map(lambda x: x['ID'], a) | |
| 8766 self.assertTrue(knee1 in b) | |
| 8767 self.assertTrue(knee2 in b) | |
| 8768 self.assertTrue(brainix in b) | |
| 8769 | |
| 8770 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, knee2 ], | |
| 8771 'Level' : 'Series' }) | |
| 8772 self.assertEqual(2, len(a)) | |
| 8773 for item in a: | |
| 8774 self.assertEqual('Series', item['Type']) | |
| 8775 b = map(lambda x: x['ID'], a) | |
| 8776 self.assertTrue(DoGet(_REMOTE, '/instances/%s' % knee1) ['ParentSeries'] in b) | |
| 8777 self.assertTrue(DoGet(_REMOTE, '/instances/%s' % knee2) ['ParentSeries'] in b) | |
| 8778 | |
| 8779 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
|
8780 'Level' : 'Study', |
|
8a3d67a40083
test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
417
diff
changeset
|
8781 'Metadata' : False }) |
| 415 | 8782 self.assertEqual(1, len(a)) |
| 8783 self.assertEqual(DoGet(_REMOTE, '/instances/%s/study' % knee1) ['ID'], a[0]['ID']) | |
| 8784 self.assertEqual('Study', a[0]['Type']) | |
| 8785 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
|
8786 self.assertFalse('Metadata' in a[0]) |
| 415 | 8787 |
| 8788 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
|
8789 'Level' : 'Patient', |
|
8a3d67a40083
test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
417
diff
changeset
|
8790 'Metadata' : True }) |
| 415 | 8791 self.assertEqual(1, len(a)) |
| 8792 self.assertEqual(DoGet(_REMOTE, '/instances/%s/patient' % knee1) ['ID'], a[0]['ID']) | |
| 8793 self.assertEqual('Patient', a[0]['Type']) | |
| 8794 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
|
8795 self.assertTrue('Metadata' in a[0]) |
|
451
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8796 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8797 self.assertEqual(2, len(a[0]['Metadata'])) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8798 self.assertTrue('MainDicomTagsSignature' in a[0]['Metadata']) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8799 else: |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8800 self.assertEqual(1, len(a[0]['Metadata'])) |
|
33051f9ac850
new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents:
449
diff
changeset
|
8801 self.assertTrue('LastUpdate' in a[0]['Metadata']) |
| 415 | 8802 |
| 8803 for level in [ 'Instance', 'Series', 'Study', 'Patient' ]: | |
| 8804 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, brainix ], | |
| 8805 'Level' : level }) | |
| 8806 self.assertEqual(2, len(a)) | |
| 8807 for item in a: | |
| 8808 self.assertEqual(level, item['Type']) | |
| 8809 b = map(lambda x: x['ID'], a) | |
| 8810 if level == 'Instance': | |
| 8811 self.assertTrue(knee1 in b) | |
| 8812 self.assertTrue(brainix in b) | |
| 8813 else: | |
| 8814 self.assertTrue(DoGet(_REMOTE, '/instances/%s/%s' % (knee1, level.lower())) ['ID'] in b) | |
| 8815 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
|
8816 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8817 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8818 def test_split_instances(self): |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8819 # New in 1.9.4 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8820 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID'] |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8821 knee2 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') ['ID'] |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8822 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8823 series = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8824 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8825 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8826 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8827 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8828 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8829 instances = DoGet(_REMOTE, '/instances') |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8830 self.assertEqual(2, len(instances)) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8831 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
|
8832 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
|
8833 for i in [ knee1, knee2 ]: |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8834 self.assertEqual(series, DoGet(_REMOTE, '/instances/%s/series' % i) ['ID']) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8835 self.assertEqual(study, DoGet(_REMOTE, '/instances/%s/study' % i) ['ID']) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8836 |
| 417 | 8837 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, { |
| 8838 'KeepSource' : False | |
| 8839 })) # Neither "Instances", nor "Series" | |
| 8840 | |
| 8841 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, { | |
| 8842 'KeepSource' : False, | |
| 8843 'Instances' : [ ], | |
| 8844 'Series' : [ ] | |
| 8845 })) # Empty "Instances" and "Series" | |
| 8846 | |
| 8847 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, { | |
| 8848 'Instances' : [ 'nope' ], | |
| 8849 'KeepSource' : False | |
| 8850 })) | |
| 8851 | |
| 8852 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, { | |
| 8853 'Series' : [ 'nope' ], | |
| 8854 'KeepSource' : False | |
| 8855 })) | |
| 8856 | |
|
416
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8857 result = DoPost(_REMOTE, '/studies/%s/split' % study, { |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8858 'Instances' : [ knee1 ], |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8859 'KeepSource' : False |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8860 }) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8861 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8862 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8863 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8864 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8865 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8866 instances = DoGet(_REMOTE, '/instances') |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8867 self.assertEqual(2, len(instances)) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8868 |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8869 self.assertFalse(knee1 in instances) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8870 self.assertTrue(knee2 in instances) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8871 instances.remove(knee2) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8872 self.assertEqual(series, DoGet(_REMOTE, '/instances/%s/series' % knee2) ['ID']) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8873 self.assertEqual(study, DoGet(_REMOTE, '/instances/%s/study' % knee2) ['ID']) |
|
80164728c038
test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
8874 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
|
8875 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
|
8876 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
|
8877 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8878 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8879 def test_merge_instances(self): |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8880 # New in Orthanc 1.9.4 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8881 knee = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID'] |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8882 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID'] |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8883 brainixStudy = DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID'] |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8884 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8885 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8886 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8887 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8888 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8889 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8890 instances = DoGet(_REMOTE, '/instances') |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8891 self.assertEqual(2, len(instances)) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8892 self.assertTrue(brainix in instances) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8893 self.assertTrue(knee in instances) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8894 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8895 result = DoPost(_REMOTE, '/studies/%s/merge' % brainixStudy, { |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8896 'Resources' : [ knee ] |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8897 }) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8898 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8899 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8900 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8901 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8902 self.assertEqual(brainixStudy, DoGet(_REMOTE, '/studies')[0]) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8903 |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8904 instances = DoGet(_REMOTE, '/instances') |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8905 self.assertEqual(2, len(instances)) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8906 self.assertTrue(brainix in instances) |
|
6a57c4efe38a
test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
418
diff
changeset
|
8907 self.assertFalse(knee in instances) |
|
423
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8908 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8909 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8910 def test_query_retrieve_format(self): |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8911 # New in Orthanc 1.9.5 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8912 # 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
|
8913 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
|
8914 study = DoGet(_REMOTE, '/instances/%s/study' % i) ['MainDicomTags']['StudyInstanceUID'] |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8915 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8916 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8917 'Level' : 'Study', |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8918 'Query' : {} |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8919 }) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8920 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8921 b = DoGet(_REMOTE, a['Path'] + '/answers') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8922 self.assertEqual(1, len(b)) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8923 self.assertEqual('0', b[0]) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8924 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8925 b = DoGet(_REMOTE, a['Path'] + '/answers?expand') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8926 self.assertEqual(1, len(b)) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8927 self.assertEqual(6, len(b[0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8928 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
|
8929 self.assertEqual('SpecificCharacterSet', b[0]['0008,0005']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8930 self.assertEqual('A10003245599', b[0]['0008,0050']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8931 self.assertEqual('AccessionNumber', b[0]['0008,0050']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8932 self.assertEqual('STUDY', b[0]['0008,0052']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8933 self.assertEqual('QueryRetrieveLevel', b[0]['0008,0052']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8934 self.assertEqual('ORTHANC', b[0]['0008,0054']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8935 self.assertEqual('RetrieveAETitle', b[0]['0008,0054']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8936 self.assertEqual('887', b[0]['0010,0020']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8937 self.assertEqual('PatientID', b[0]['0010,0020']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8938 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
|
8939 self.assertEqual('StudyInstanceUID', b[0]['0020,000d']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8940 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8941 for (key, value) in b[0].items(): |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8942 self.assertEqual('String', value['Type']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8943 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8944 self.assertEqual(json.dumps(b[0]), |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8945 json.dumps(DoGet(_REMOTE, a['Path'] + '/answers/0/content'))) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8946 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8947 # 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
|
8948 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8949 b = DoGet(_REMOTE, a['Path'] + '/answers?expand&short') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8950 self.assertEqual(1, len(b)) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8951 self.assertEqual(6, len(b[0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8952 self.assertEqual('ISO_IR 100', b[0]['0008,0005']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8953 self.assertEqual('A10003245599', b[0]['0008,0050']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8954 self.assertEqual('STUDY', b[0]['0008,0052']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8955 self.assertEqual('ORTHANC', b[0]['0008,0054']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8956 self.assertEqual('887', b[0]['0010,0020']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8957 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
|
8958 self.assertEqual(json.dumps(b[0]), |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8959 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
|
8960 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8961 b = DoGet(_REMOTE, a['Path'] + '/answers?expand&simplify') |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8962 self.assertEqual(1, len(b)) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8963 self.assertEqual(6, len(b[0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8964 self.assertEqual('ISO_IR 100', b[0]['SpecificCharacterSet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8965 self.assertEqual('A10003245599', b[0]['AccessionNumber']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8966 self.assertEqual('STUDY', b[0]['QueryRetrieveLevel']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8967 self.assertEqual('ORTHANC', b[0]['RetrieveAETitle']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8968 self.assertEqual('887', b[0]['PatientID']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8969 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
|
8970 self.assertEqual(json.dumps(b[0]), |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8971 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
|
8972 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8973 b = DoPost(_REMOTE, '/queries/%s/retrieve' % a['ID'], {}) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8974 self.assertEqual('REST API', b['Description']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8975 self.assertEqual('ORTHANC', b['LocalAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8976 self.assertEqual('ORTHANC', b['RemoteAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8977 self.assertEqual(1, len(b['Query'])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8978 self.assertEqual(4, len(b['Query'][0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8979 self.assertEqual('A10003245599', b['Query'][0]['0008,0050']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8980 self.assertEqual('STUDY', b['Query'][0]['0008,0052']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8981 self.assertEqual('887', b['Query'][0]['0010,0020']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8982 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
|
8983 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8984 # 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
|
8985 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8986 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
|
8987 self.assertEqual('REST API', b['Description']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8988 self.assertEqual('ORTHANC', b['LocalAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8989 self.assertEqual('ORTHANC', b['RemoteAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8990 self.assertEqual(1, len(b['Query'])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8991 self.assertEqual(4, len(b['Query'][0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8992 self.assertEqual('A10003245599', b['Query'][0]['0008,0050']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8993 self.assertEqual('STUDY', b['Query'][0]['0008,0052']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8994 self.assertEqual('887', b['Query'][0]['0010,0020']['Value']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8995 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
|
8996 self.assertEqual('AccessionNumber', b['Query'][0]['0008,0050']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8997 self.assertEqual('QueryRetrieveLevel', b['Query'][0]['0008,0052']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8998 self.assertEqual('PatientID', b['Query'][0]['0010,0020']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
8999 self.assertEqual('StudyInstanceUID', b['Query'][0]['0020,000d']['Name']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
9000 |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
9001 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
|
9002 self.assertEqual('REST API', b['Description']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
9003 self.assertEqual('ORTHANC', b['LocalAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
9004 self.assertEqual('ORTHANC', b['RemoteAet']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
9005 self.assertEqual(1, len(b['Query'])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
9006 self.assertEqual(4, len(b['Query'][0])) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
9007 self.assertEqual('A10003245599', b['Query'][0]['AccessionNumber']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
9008 self.assertEqual('STUDY', b['Query'][0]['QueryRetrieveLevel']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
9009 self.assertEqual('887', b['Query'][0]['PatientID']) |
|
cef3847dc8af
test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
420
diff
changeset
|
9010 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
|
9011 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9012 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9013 def test_anonymize_nested(self): |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9014 # New in Orthanc 1.9.5 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9015 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9016 tags = { |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9017 'MappingResourceIdentificationSequence' : [ |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9018 { |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9019 # Test "DicomModification::RelationshipsVisitor::GetDefaultAction()" |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9020 '0009,1002' : 'ABCD', # Private tag not registered in dictionary |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9021 '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
|
9022 '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
|
9023 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9024 # Test "DicomModification::RelationshipsVisitor::VisitString()" |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9025 'StudyDescription' : 'Hello', # Removed |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9026 'StudyDate' : '20210705', # Cleared |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9027 '0009,1001' : '-1234', # Private tag whose VR is DS |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9028 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9029 # Test anonymization of nested sequences |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9030 'ReferencedStudySequence' : [ |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9031 { |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9032 'PatientID' : 'HELLO' |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9033 } |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9034 ], |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9035 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9036 # Non-anonymized tags |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9037 'CodeMeaning' : 'MEANING1', |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9038 'EquivalentCodeSequence' : [ |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9039 { |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9040 'CodeMeaning' : 'MEANING2', |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9041 } |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9042 ], |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9043 } |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9044 ], |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9045 } |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9046 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9047 a = DoPost(_REMOTE, '/tools/create-dicom', |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9048 json.dumps({ |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9049 'Tags' : tags, |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9050 'PrivateCreator' : 'Lunit', |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9051 })) ['ID'] |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9052 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9053 study = DoGet(_REMOTE, '/instances/%s/study' % a) ['ID'] |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9054 b = DoPost(_REMOTE, '/studies/%s/anonymize' % study, {}) ['ID'] |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9055 c = DoGet(_REMOTE, '/studies/%s/instances' % b) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9056 self.assertEqual(1, len(c)) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9057 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9058 tags1 = DoGet(_REMOTE, '/instances/%s/tags?short' % a) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9059 tags2 = DoGet(_REMOTE, '/instances/%s/tags?short' % c[0]['ID']) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9060 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9061 # Only "StudyDate" must be present in |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9062 # "MappingResourceIdentificationSequence" after anonymization |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9063 self.assertEqual(1, len(tags1['0008,0124'])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9064 self.assertEqual(1, len(tags2['0008,0124'])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9065 self.assertEqual(9, len(tags1['0008,0124'][0])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9066 self.assertEqual(3, len(tags2['0008,0124'][0])) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9067 self.assertEqual('', tags2['0008,0124'][0]['0008,0020']) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9068 self.assertEqual('MEANING1', tags2['0008,0124'][0]['0008,0104']) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9069 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
|
9070 |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9071 self.assertTrue('0008,1110' in tags1['0008,0124'][0]) |
|
934f505677da
test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
423
diff
changeset
|
9072 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
|
9073 |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
9074 |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
9075 def test_issue_200(self): |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
9076 # https://groups.google.com/g/orthanc-users/c/9CTLsL-JqDw/m/2I0xgyYHBAAJ |
|
589
47b87c87213b
new tests for GET /tools/create-archive
Alain Mazy <am@osimis.io>
parents:
588
diff
changeset
|
9077 # https://bugs.orthanc-server.com/show_bug.cgi?id=200 |
| 428 | 9078 self.assertEqual(0, len(DoGet(_REMOTE, '/changes') ['Changes'])) |
| 9079 self.assertEqual(0, len(DoGet(_REMOTE, '/changes?last') ['Changes'])) | |
| 429 | 9080 u = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
427
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
9081 |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
9082 for change in DoGet(_REMOTE, '/changes') ['Changes']: |
|
77455e156112
integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
424
diff
changeset
|
9083 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
|
9084 self.assertTrue(re.match('[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}', change['ID'])) |
| 428 | 9085 |
| 9086 last = DoGet(_REMOTE, '/changes?last') ['Changes'] | |
| 9087 self.assertEqual(1, len(last)) | |
| 9088 self.assertTrue(re.match('[0-9]{8}T[0-9]{6}', last[0]['Date'])) | |
| 9089 self.assertTrue(re.match('[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}', last[0]['ID'])) | |
| 429 | 9090 |
| 9091 self.assertEqual(0, len(DoGet(_REMOTE, '/exports') ['Exports'])) | |
| 9092 self.assertEqual(0, len(DoGet(_REMOTE, '/exports?last') ['Exports'])) | |
| 9093 DoPost(_REMOTE, '/modalities/self/store', [ u ]) | |
| 9094 | |
| 9095 for change in DoGet(_REMOTE, '/exports') ['Exports']: | |
| 9096 self.assertTrue(re.match('[0-9]{8}T[0-9]{6}', change['Date'])) | |
| 9097 self.assertTrue(re.match('[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}', change['ID'])) | |
| 9098 | |
| 9099 last = DoGet(_REMOTE, '/exports?last') ['Exports'] | |
| 9100 self.assertEqual(1, len(last)) | |
| 9101 self.assertEqual('ozp00SjY2xG', last[0]['PatientID']) | |
| 9102 self.assertEqual('self', last[0]['RemoteModality']) | |
| 9103 self.assertEqual('Instance', last[0]['ResourceType']) | |
| 9104 self.assertEqual('/instances/%s' % last[0]['ID'], last[0]['Path']) | |
| 9105 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', last[0]['StudyInstanceUID']) | |
| 9106 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', last[0]['SeriesInstanceUID']) | |
| 9107 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', last[0]['SOPInstanceUID']) | |
| 9108 self.assertTrue(re.match('[0-9]{8}T[0-9]{6}', last[0]['Date'])) | |
| 9109 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
|
9110 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
9111 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
9112 def test_upload_dicomdir_archive(self): |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
9113 # This test fails on Orthanc <= 1.9.6 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
9114 # 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
|
9115 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
9116 # Create a ZIP archive with a DICOMDIR |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
9117 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
9118 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
9119 media = DoGet(_REMOTE, '/studies/%s/media' % study) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
9120 DoDelete(_REMOTE, '/instances/%s' % instance) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
9121 |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
9122 result = DoPost(_REMOTE, '/instances', media) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
9123 self.assertEqual(1, len(result)) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
9124 self.assertEqual(instance, result[0]['ID']) |
|
e665c493e23e
test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
429
diff
changeset
|
9125 self.assertEqual('Success', result[0]['Status']) |
|
432
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9126 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9127 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9128 def test_modify_keep_source(self): |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9129 # 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
|
9130 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9131 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9132 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9133 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9134 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, {}) ['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9135 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9136 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9137 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9138 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9139 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
|
9140 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9141 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9142 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9143 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9144 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
|
9145 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9146 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9147 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9148 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9149 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9150 a = DoPost(_REMOTE, '/studies/%s/modify' % study, { 'Replace' : { } }) ['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9151 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9152 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9153 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9154 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9155 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
|
9156 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9157 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9158 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9159 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9160 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
|
9161 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9162 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9163 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9164 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9165 def GetStudy(a): |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9166 b = filter(lambda x: x['Type'] == 'Study', a['Resources']) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9167 if len(b) == 1: |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9168 return b[0]['ID'] |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9169 else: |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9170 raise Exception() |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9171 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9172 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9173 a = GetStudy(DoPost(_REMOTE, '/tools/bulk-anonymize', { 'Resources' : [ study ]})) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9174 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9175 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9176 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9177 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9178 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
|
9179 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9180 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9181 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9182 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9183 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
|
9184 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9185 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9186 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9187 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9188 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9189 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
|
9190 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9191 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9192 # 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
|
9193 # 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
|
9194 # the original instance |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9195 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9196 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9197 # 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
|
9198 # introduced in 1.9.7 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9199 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9200 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9201 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
|
9202 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9203 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9204 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9205 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9206 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
|
9207 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9208 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9209 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9210 |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9211 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
|
9212 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9213 DoDelete(_REMOTE, '/studies/%s' % a) |
|
f4609c97e995
test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
431
diff
changeset
|
9214 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) |
|
433
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9215 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9216 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9217 def test_multiframe_windowing(self): |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9218 # Fixed in Orthanc 1.9.7 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9219 a = UploadInstance(_REMOTE, 'MultiframeWindowing.dcm') ['ID'] |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9220 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9221 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
|
9222 self.assertEqual(0x00, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9223 self.assertEqual(0x10, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9224 self.assertEqual(0x20, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9225 self.assertEqual(0x30, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9226 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9227 # 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
|
9228 # mid-level value (i.e. 127) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9229 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
|
9230 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9231 self.assertEqual(127, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9232 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9233 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9234 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9235 # 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
|
9236 im = GetImage(_REMOTE, '/instances/%s/frames/0/rendered' % a) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9237 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9238 self.assertEqual(127, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9239 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9240 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9241 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9242 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
|
9243 self.assertEqual(100, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9244 self.assertEqual(116, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9245 self.assertEqual(132, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9246 self.assertEqual(148, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9247 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9248 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
|
9249 self.assertEqual(0, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9250 self.assertEqual(32, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9251 self.assertEqual(64, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9252 self.assertEqual(96, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9253 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9254 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
|
9255 self.assertEqual(100, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9256 self.assertEqual(132, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9257 self.assertEqual(164, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9258 self.assertEqual(196, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9259 |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9260 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
|
9261 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9262 self.assertEqual(127, im.getpixel((1, 0))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9263 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9264 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1))) |
|
cb579ad96a6c
test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
432
diff
changeset
|
9265 |
|
436
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9266 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9267 def test_dicom_seg(self): |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9268 # This test fails in Orthanc <= 1.9.7 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9269 a = UploadInstance(_REMOTE, 'DicomSeg.dcm') ['ID'] |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9270 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9271 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
|
9272 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
|
9273 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9274 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
|
9275 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
|
9276 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9277 for i in range(96): |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9278 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
|
9279 self.assertEqual('L', im.mode) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9280 self.assertEqual(256, im.size[0]) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9281 self.assertEqual(256, im.size[1]) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9282 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9283 e = im.getextrema() |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9284 self.assertEqual(0, e[0]) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9285 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9286 if e[1] == 0: |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9287 self.assertFalse(i in nonEmptyFrames) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9288 else: |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9289 self.assertTrue(i in nonEmptyFrames) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9290 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9291 im1 = GetImage(_REMOTE, '/instances/%s/frames/44/preview' % a) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9292 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9293 # 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
|
9294 im2 = Image.open(GetDatabasePath('DicomSeg-Frame45.pgm')) |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9295 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
|
9296 |
|
9f87d5b2b382
added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
433
diff
changeset
|
9297 self.assertTrue(ImageChops.difference(im1, im2).getbbox() is None) |
| 440 | 9298 |
| 9299 | |
| 9300 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
|
9301 # New in Orthanc 1.10.0 |
| 440 | 9302 a = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] |
| 9303 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm') | |
| 9304 b = UploadInstance(_REMOTE, 'DicomSeg.dcm') ['ID'] | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9305 d = UploadInstance(_REMOTE, 'Issue124.dcm') ['ID'] |
| 440 | 9306 |
| 9307 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/0/numpy' % a))) | |
| 9308 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 9309 self.assertEqual(numpy.float32, c.dtype) | |
| 9310 self.assertEqual((288, 288, 1), c.shape) | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9311 self.assertAlmostEqual(0, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9312 self.assertAlmostEqual(536, c.max()) |
| 440 | 9313 |
| 9314 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/0/numpy?rescale=0' % a))) | |
| 9315 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 9316 self.assertEqual(numpy.uint16, c.dtype) | |
| 9317 self.assertEqual((288, 288, 1), c.shape) | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9318 self.assertEqual(0, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9319 self.assertEqual(536, c.max()) |
| 440 | 9320 |
| 9321 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/numpy?rescale=1&compress=false' % a))) | |
| 9322 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 9323 self.assertEqual(numpy.float32, c.dtype) | |
| 9324 self.assertEqual((1, 288, 288, 1), c.shape) | |
| 9325 | |
| 9326 series = DoGet(_REMOTE, '/instances/%s/series' % a)['ID'] | |
| 9327 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/series/%s/numpy?rescale=true&compress=0' % series))) | |
| 9328 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 9329 self.assertEqual(numpy.float32, c.dtype) | |
| 9330 self.assertEqual((2, 288, 288, 1), c.shape) | |
| 9331 | |
| 9332 series = DoGet(_REMOTE, '/instances/%s/series' % a)['ID'] | |
| 9333 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/series/%s/numpy?rescale=1' % series))) | |
| 9334 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 9335 self.assertEqual(numpy.float32, c.dtype) | |
| 9336 self.assertEqual((2, 288, 288, 1), c.shape) | |
| 9337 | |
| 9338 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/numpy?compress' % a))) | |
| 9339 self.assertTrue(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 9340 self.assertEqual(1, len(c.files)) | |
| 9341 self.assertEqual(numpy.float32, c['arr_0'].dtype) | |
| 9342 self.assertEqual((1, 288, 288, 1), c['arr_0'].shape) | |
| 9343 | |
| 9344 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/0/numpy' % b))) | |
| 9345 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 9346 self.assertEqual(numpy.float32, c.dtype) | |
| 9347 self.assertEqual((256, 256, 1), c.shape) | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9348 self.assertAlmostEqual(0, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9349 self.assertAlmostEqual(0, c.max()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9350 |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9351 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
|
9352 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9353 self.assertEqual(numpy.float32, c.dtype) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9354 self.assertEqual((256, 256, 1), c.shape) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9355 self.assertAlmostEqual(0, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9356 self.assertAlmostEqual(255, c.max()) |
| 440 | 9357 |
| 9358 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/numpy' % b))) | |
| 9359 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 9360 self.assertEqual(numpy.float32, c.dtype) | |
| 9361 self.assertEqual((96, 256, 256, 1), c.shape) | |
| 9362 | |
| 9363 series = DoGet(_REMOTE, '/instances/%s/series' % b)['ID'] | |
| 9364 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/series/%s/numpy' % series))) | |
| 9365 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) | |
| 9366 self.assertEqual(numpy.float32, c.dtype) | |
| 9367 self.assertEqual((96, 256, 256, 1), c.shape) | |
|
441
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9368 |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9369 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
|
9370 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9371 self.assertEqual(numpy.float32, c.dtype) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9372 self.assertEqual((512, 512, 1), c.shape) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9373 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
|
9374 self.assertAlmostEqual(2374, c.max()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9375 |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9376 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
|
9377 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile)) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9378 self.assertEqual(numpy.int16, c.dtype) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9379 self.assertEqual((512, 512, 1), c.shape) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9380 self.assertEqual(-2000, c.min()) |
|
21a45ddc9256
expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
440
diff
changeset
|
9381 self.assertEqual(3398, c.max()) |
|
442
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9382 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9383 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9384 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
|
9385 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
|
9386 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9387 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
|
9388 "Replace" : { |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9389 "PatientName" : "MyName[*]", |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9390 "PatientID": "test_brackets" |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9391 }, |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9392 "Force": True |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9393 }), |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9394 'application/json') |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9395 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9396 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
|
9397 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9398 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
|
9399 'Query' : { 'PatientName' : 'MyName[*]' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9400 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9401 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9402 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
|
9403 'Query' : { 'PatientName' : 'MyName[*]' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9404 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9405 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9406 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
|
9407 'Query' : { 'PatientName' : 'MyName*' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9408 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9409 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9410 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
|
9411 'Query' : { 'PatientName' : 'MyName*' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9412 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9413 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9414 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
|
9415 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
|
9416 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9417 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
|
9418 "Replace" : { |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9419 "PatientName" : "MyName2[]", |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9420 "PatientID": "test_brackets2" |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9421 }, |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9422 "Force": True |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9423 }), |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9424 'application/json') |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9425 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9426 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
|
9427 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9428 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
|
9429 'Query' : { 'PatientName' : 'MyName2[*]' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9430 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9431 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9432 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
|
9433 'Query' : { 'PatientName' : 'MyName2[*]' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9434 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9435 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9436 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
|
9437 'Query' : { 'PatientName' : 'MyName2*' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9438 self.assertEqual(1, len(a)) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9439 |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9440 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
|
9441 'Query' : { 'PatientName' : 'MyName2*' }}) |
|
af57603438b3
added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents:
441
diff
changeset
|
9442 self.assertEqual(1, len(a)) |
|
455
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
9443 |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
9444 |
|
452
45dd181b0f17
added test for requestedTags in tools/find + list-resources
Alain Mazy <am@osimis.io>
parents:
451
diff
changeset
|
9445 def test_rest_find_requested_tags(self): |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
9446 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): # RequestedTags introduced in 1.11.0 but Sequences allowed since 1.11.1 |
| 471 | 9447 |
| 9448 # Upload instances | |
| 9449 for i in range(2): | |
| 9450 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 9451 | |
| 9452 # Patient level | |
| 9453 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 9454 'CaseSensitive' : False, | |
| 9455 'Query' : { 'PatientName' : 'BRAINIX' }, | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
9456 'RequestedTags' : [ 'PatientName', 'PatientID', 'PatientSex', 'PatientBirthDate'], |
| 471 | 9457 'Expand': True |
| 9458 }) | |
| 9459 self.assertEqual(1, len(a)) | |
| 9460 self.assertIn('PatientName', a[0]['RequestedTags']) | |
| 9461 self.assertIn('PatientID', a[0]['RequestedTags']) | |
| 9462 self.assertIn('PatientSex', a[0]['RequestedTags']) | |
| 9463 self.assertIn('PatientBirthDate', a[0]['RequestedTags']) | |
| 9464 | |
| 9465 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9466 self.assertEqual('5Yp0E', a[0]['RequestedTags']['PatientID']) | |
| 9467 self.assertEqual('0000', a[0]['RequestedTags']['PatientSex']) | |
| 9468 self.assertEqual('19490301', a[0]['RequestedTags']['PatientBirthDate']) | |
| 9469 | |
| 9470 # Study level, request patient tags too | |
| 9471 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 9472 'CaseSensitive' : False, | |
| 9473 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 9474 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID'], | |
| 9475 'Expand': True | |
| 9476 }) | |
| 9477 self.assertEqual(1, len(a)) | |
| 9478 self.assertIn('PatientName', a[0]['RequestedTags']) | |
| 9479 self.assertIn('StudyInstanceUID', a[0]['RequestedTags']) | |
| 9480 | |
| 9481 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9482 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9483 | |
| 9484 | |
| 9485 # Series level, request patient and study tags too | |
| 9486 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 9487 'CaseSensitive' : False, | |
| 9488 'Query' : { 'PatientName' : 'BRAINIX' }, | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
9489 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'RequestAttributesSequence'], |
| 471 | 9490 'Expand': True |
| 9491 }) | |
| 9492 self.assertEqual(1, len(a)) | |
| 9493 self.assertIn('PatientName', a[0]['RequestedTags']) | |
| 9494 self.assertIn('StudyInstanceUID', a[0]['RequestedTags']) | |
| 9495 self.assertIn('SeriesInstanceUID', a[0]['RequestedTags']) | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
9496 self.assertIn('RequestAttributesSequence', a[0]['RequestedTags']) |
| 471 | 9497 |
| 9498 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9499 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9500 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
|
9501 self.assertEqual('A10029316690', a[0]['RequestedTags']['RequestAttributesSequence'][0]['RequestedProcedureID']) |
| 471 | 9502 |
| 9503 | |
| 9504 # Instance level, request patient, study and series tags too, include tags that are not part of the main dicom tags | |
| 9505 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 9506 'CaseSensitive' : False, | |
| 9507 'Query' : { 'PatientName' : 'BRAINIX' }, | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
9508 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'PhotometricInterpretation', 'RequestAttributesSequence'], |
| 471 | 9509 'Expand': True |
| 9510 }) | |
| 9511 self.assertEqual(1, len(a)) | |
| 9512 self.assertIn('PatientName', a[0]['RequestedTags']) | |
| 9513 self.assertIn('StudyInstanceUID', a[0]['RequestedTags']) | |
| 9514 self.assertIn('SeriesInstanceUID', a[0]['RequestedTags']) | |
| 9515 self.assertIn('PhotometricInterpretation', a[0]['RequestedTags']) | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
9516 self.assertIn('RequestAttributesSequence', a[0]['RequestedTags']) |
| 471 | 9517 |
| 9518 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9519 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9520 self.assertEqual('1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', a[0]['RequestedTags']['SeriesInstanceUID']) | |
| 9521 self.assertEqual('MONOCHROME2', a[0]['RequestedTags']['PhotometricInterpretation']) | |
|
486
6144ef431512
new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents:
482
diff
changeset
|
9522 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
|
9523 |
|
45dd181b0f17
added test for requestedTags in tools/find + list-resources
Alain Mazy <am@osimis.io>
parents:
451
diff
changeset
|
9524 |
|
453
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
9525 def test_rest_find_requested_tags_computed_tags(self): |
| 471 | 9526 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 9527 # Upload instances | |
| 9528 for i in range(2): | |
| 9529 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 9530 | |
| 9531 | |
| 9532 # Patient level | |
| 9533 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 9534 'CaseSensitive' : False, | |
| 9535 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 9536 'RequestedTags' : [ 'PatientName', 'NumberOfPatientRelatedStudies', 'NumberOfPatientRelatedSeries', 'NumberOfPatientRelatedInstances'], | |
| 9537 'Expand': True | |
| 9538 }) | |
| 9539 self.assertEqual(1, len(a)) | |
| 9540 | |
| 9541 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9542 self.assertEqual('1', a[0]['RequestedTags']['NumberOfPatientRelatedStudies']) | |
| 9543 self.assertEqual('1', a[0]['RequestedTags']['NumberOfPatientRelatedSeries']) | |
| 9544 self.assertEqual('2', a[0]['RequestedTags']['NumberOfPatientRelatedInstances']) | |
| 9545 | |
| 9546 # Study level | |
| 9547 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 9548 'CaseSensitive' : False, | |
| 9549 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 9550 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'ModalitiesInStudy', 'SOPClassesInStudy', 'NumberOfStudyRelatedInstances', 'NumberOfStudyRelatedSeries'], | |
| 9551 'Expand': True | |
| 9552 }) | |
| 9553 self.assertEqual(1, len(a)) | |
| 9554 | |
| 9555 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9556 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9557 self.assertEqual('MR', a[0]['RequestedTags']['ModalitiesInStudy']) | |
| 9558 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', a[0]['RequestedTags']['SOPClassesInStudy']) | |
| 9559 self.assertEqual('2', a[0]['RequestedTags']['NumberOfStudyRelatedInstances']) | |
| 9560 self.assertEqual('1', a[0]['RequestedTags']['NumberOfStudyRelatedSeries']) | |
| 9561 | |
| 9562 # Series level | |
| 9563 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 9564 'CaseSensitive' : False, | |
| 9565 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 9566 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'NumberOfSeriesRelatedInstances'], | |
| 9567 'Expand': True | |
| 9568 }) | |
| 9569 self.assertEqual(1, len(a)) | |
| 9570 | |
| 9571 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9572 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9573 self.assertEqual('2', a[0]['RequestedTags']['NumberOfSeriesRelatedInstances']) | |
| 9574 | |
| 9575 # Instance level | |
| 9576 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', | |
| 9577 'CaseSensitive' : False, | |
| 9578 'Query' : { 'PatientName' : 'BRAINIX' }, | |
| 9579 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SOPInstanceUID', 'InstanceAvailability'], | |
| 9580 'Expand': True | |
| 9581 }) | |
| 9582 self.assertEqual(2, len(a)) | |
| 9583 | |
| 9584 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) | |
| 9585 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9586 self.assertEqual('ONLINE', a[0]['RequestedTags']['InstanceAvailability']) | |
| 456 | 9587 |
|
452
45dd181b0f17
added test for requestedTags in tools/find + list-resources
Alain Mazy <am@osimis.io>
parents:
451
diff
changeset
|
9588 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
|
9589 |
| 471 | 9590 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 9591 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] | |
| 9592 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] | |
| 9593 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] | |
| 9594 | |
| 9595 # list series and request tags that are not in the default main dicom tags | |
| 9596 a = DoGet(_REMOTE, '/studies/%s/series?expand&simplify&requestedTags=PatientName;Modality;SeriesInstanceUID;MRAcquisitionType' % study) | |
| 9597 | |
| 9598 self.assertEqual('2D', a[0]['RequestedTags']['MRAcquisitionType']) | |
| 9599 self.assertEqual('MR', a[0]['RequestedTags']['Modality']) | |
| 9600 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 9601 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID']) | |
| 9602 | |
| 9603 # list studies and request patient and studies tags | |
| 9604 a = DoGet(_REMOTE, '/patients/%s/studies?expand&simplify&requestedTags=PatientName;StudyInstanceUID' % patient) | |
| 9605 | |
| 9606 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9607 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 9608 | |
| 9609 | |
| 9610 # list instances and request patient, studies and series tags including tags that are not in main dicom tags | |
| 9611 a = DoGet(_REMOTE, '/patients/%s/instances?expand&simplify&requestedTags=PatientName;StudyInstanceUID;SeriesInstanceUID;SOPInstanceUID;Rows;Columns;InstanceAvailability' % patient) | |
| 9612 | |
| 9613 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9614 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID']) | |
| 9615 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a[0]['RequestedTags']['SOPInstanceUID']) | |
| 9616 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 9617 self.assertEqual('512', a[0]['RequestedTags']['Rows']) | |
| 9618 self.assertEqual('512', a[0]['RequestedTags']['Columns']) | |
| 9619 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
|
9620 |
|
453
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
9621 |
|
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
9622 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
|
9623 |
| 471 | 9624 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 696 | 9625 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0001.dcm') # make sure there are 2 different SOPClassUID in the DB |
| 9626 | |
| 471 | 9627 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] |
| 9628 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] | |
| 9629 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] | |
| 9630 | |
| 9631 # list studies and request patient and studies tags, including ModalitiesInStudy | |
| 9632 a = DoGet(_REMOTE, '/patients/%s/studies?expand&simplify&requestedTags=PatientName;StudyInstanceUID;ModalitiesInStudy;SOPClassesInStudy;NumberOfStudyRelatedInstances;NumberOfStudyRelatedSeries' % patient) | |
| 9633 | |
| 9634 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID']) | |
| 9635 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 9636 self.assertEqual('MR', a[0]['RequestedTags']['ModalitiesInStudy']) | |
| 9637 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', a[0]['RequestedTags']['SOPClassesInStudy']) | |
| 9638 self.assertEqual('1', a[0]['RequestedTags']['NumberOfStudyRelatedInstances']) | |
| 9639 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
|
9640 |
| 696 | 9641 a = DoGet(_REMOTE, '/studies/%s?expand&simplify&requestedTags=ModalitiesInStudy;NumberOfStudyRelatedInstances;NumberOfStudyRelatedSeries;SOPClassesInStudy' % study) |
| 9642 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', a['RequestedTags']['SOPClassesInStudy']) | |
| 9643 | |
|
453
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
9644 |
|
46ae8fb09254
test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents:
452
diff
changeset
|
9645 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
|
9646 |
| 471 | 9647 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): |
| 9648 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] | |
| 9649 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] | |
| 9650 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] | |
| 9651 | |
| 9652 # list studies and request patient and studies tags, including ModalitiesInStudy | |
| 9653 a = DoGet(_REMOTE, '/studies/%s/series?expand&simplify&requestedTags=PatientName;SeriesInstanceUID;NumberOfSeriesRelatedInstances' % study) | |
| 9654 | |
| 9655 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID']) | |
| 9656 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) | |
| 9657 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
|
9658 |
|
455
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
9659 def test_dicomweb_jpeg2k_implicit(self): |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
9660 # This is a file encoded using 1.2.840.10008.1.2.4.90 transfer |
| 457 | 9661 # 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
|
9662 # representation. Support introduced in Orthanc 1.10.1. |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
9663 # 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
|
9664 a = UploadInstance(_REMOTE, '2022-03-08-RicSmi.dcm') ['ID'] |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
9665 b = DoGet(_REMOTE, '/instances/%s/file' % a, |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
9666 headers = { 'Accept' : 'application/dicom+json' }) |
|
f53cd250becc
test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
449
diff
changeset
|
9667 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
|
9668 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
|
9669 |
|
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
|
9670 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
|
9671 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
|
9672 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
|
9673 |
|
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
|
9674 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
|
9675 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
|
9676 '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
|
9677 '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
|
9678 '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
|
9679 '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
|
9680 })) |
|
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
|
9681 |
|
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
|
9682 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
|
9683 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
|
9684 |
|
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
|
9685 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
|
9686 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
|
9687 |
|
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
|
9688 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
|
9689 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
|
9690 |
|
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
|
9691 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
|
9692 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
|
9693 self.assertEqual(j['ID'], i['ID']) |
|
501
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
9694 |
|
1b1bb8621021
/store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents:
500
diff
changeset
|
9695 def test_storescu_custom_host_ip_port(self): |
| 510 | 9696 if IsOrthancVersionAbove(_REMOTE, 1, 11, 3): |
| 9697 DropOrthanc(_LOCAL) | |
| 9698 DropOrthanc(_REMOTE) | |
| 9699 | |
| 9700 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 9701 | |
| 9702 # upload to self -> orthanctest shall not receive any content | |
| 9703 DoPost(_REMOTE, '/modalities/self/store', { | |
| 9704 'Resources' : [ a['ID']] | |
| 9705 }) | |
| 9706 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 9707 | |
| 9708 # upload to self by overriding it with config from orthanctest -> orthanctest shall receive the content | |
| 9709 c = DoGet(_REMOTE, '/modalities/orthanctest/configuration') | |
| 9710 DoPost(_REMOTE, '/modalities/self/store', { | |
| 9711 'LocalAet' : 'YOP', | |
| 9712 'CalledAet' : c['AET'], | |
| 9713 'Port' : c['Port'], | |
| 9714 'Host' : c['Host'], | |
| 9715 'Resources' : [ a['ID']] | |
| 9716 }) | |
| 9717 | |
| 9718 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 9719 | |
| 9720 DropOrthanc(_REMOTE) | |
| 9721 DropOrthanc(_LOCAL) | |
|
503
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
9722 |
|
138d5efd4407
added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
502
diff
changeset
|
9723 def test_rle_planar_configuration(self): |
| 531 | 9724 if IsOrthancVersionAbove(_REMOTE, 1, 11, 2): |
| 9725 # https://groups.google.com/g/orthanc-users/c/CSVWfRasSR0/m/y1XDRXVnAgAJ | |
| 9726 a = UploadInstance(_REMOTE, '2022-11-14-RLEPlanarConfiguration.dcm') ['ID'] | |
| 9727 uri = '/instances/%s/preview' % a | |
| 9728 im = GetImage(_REMOTE, uri) | |
| 9729 self.assertEqual('RGB', im.mode) | |
| 9730 self.assertEqual(1475, im.size[0]) | |
| 9731 self.assertEqual(1475, im.size[1]) | |
| 9732 self.assertEqual('c684b0050dc2523041240bf2d26dc85e', ComputeMD5(DoGet(_REMOTE, uri))) | |
| 9733 | |
| 9734 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1): | |
| 9735 a = UploadInstance(_REMOTE, '2023-04-21-RLEPlanarConfigurationYBR_FULL.dcm') ['ID'] | |
| 9736 uri = '/instances/%s/preview' % a | |
| 9737 im = GetImage(_REMOTE, uri) | |
| 9738 self.assertEqual('RGB', im.mode) | |
| 9739 self.assertEqual(1260, im.size[0]) | |
| 9740 self.assertEqual(910, im.size[1]) | |
| 9741 self.assertEqual('07a3ea7ea08d54362f744cc5945e8743', ComputeMD5(DoGet(_REMOTE, uri))) | |
| 9742 | |
| 512 | 9743 |
| 9744 def test_rest_api_write_to_file_system(self): | |
| 9745 if IsOrthancVersionAbove(_REMOTE, 1, 12, 0): | |
| 9746 a = UploadInstance(_REMOTE, '2022-11-14-RLEPlanarConfiguration.dcm') ['ID'] | |
| 9747 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances/%s/export' % a, '/tmp/test.dcm')) | |
| 513 | 9748 |
|
515
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9749 def test_overwrite_generates_stable_study(self): |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9750 |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9751 # This test makes sure there are no regression wrt StableStudy when uploading instances in Orthanc |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9752 # The current behaviour (tested from 1.5.7 to 1.12.0) is |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9753 # If you upload 2 instances with a delay > StableAge, you get 2 StableStudy events and they are both listed in /changes |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9754 # If you upload twice the same instance with a delay > StableAge, you get 2 StableStudy events but only the last one is listed in /changes, the first one is deleted |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9755 # If you upload an instance and a modified version of this instance with a delay > StableAge, you get 2 StableStudy events but only the last one is listed in /changes, the first one is deleted |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9756 |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9757 |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9758 def GetAllStableStudyChangesIds(studyId, timeout): |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9759 # try to be as fast as possible -> stop as soon as we've found a StableStudy event that appeared after we started monitoring |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9760 fromSeq = DoGet(_REMOTE, '/changes')["Last"] |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9761 |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9762 endTime = time.time() + timeout |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9763 newStableStudyFound = False |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9764 while not newStableStudyFound and time.time() < endTime: |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9765 time.sleep(0.1) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9766 changes = DoGet(_REMOTE, '/changes') |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9767 stableStudyChangesIds = [] |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9768 |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9769 for change in changes["Changes"]: |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9770 if change["ChangeType"] == "StableStudy" and studyId == change["ID"]: |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9771 stableStudyChangesIds.append(change["Seq"]) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9772 if change["Seq"] > fromSeq: |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9773 newStableStudyFound = True |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9774 |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9775 return stableStudyChangesIds |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9776 |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9777 if True: |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9778 DropOrthanc(_REMOTE) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9779 upload1 = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm') |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9780 # StableAge is set to 1, expect a StableStudy within 4 seconds |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9781 changes1 = GetAllStableStudyChangesIds(upload1["ParentStudy"], 4) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9782 self.assertEqual(1, len(changes1)) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9783 |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9784 # upload the same instance again and check a new change has been generated with a new id, the first change has been deleted |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9785 upload1b = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm') |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9786 changes1b = GetAllStableStudyChangesIds(upload1b["ParentStudy"], 4) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9787 self.assertEqual(1, len(changes1b)) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9788 self.assertNotEqual(changes1[0], changes1b[0]) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9789 |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9790 if True: |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9791 DropOrthanc(_REMOTE) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9792 upload1 = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm') |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9793 # StableAge is set to 1, expect a StableStudy within 4 seconds |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9794 changes1 = GetAllStableStudyChangesIds(upload1["ParentStudy"], 4) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9795 self.assertEqual(1, len(changes1)) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9796 |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9797 # reupload a modified instance in the same study and check a new change has been generated with a new id, the first change has been deleted |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9798 modified = DoPost(_REMOTE, '/instances/%s/modify' % upload1["ID"], |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9799 json.dumps({ |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9800 "Replace" : { |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9801 "InstitutionName" : "hello", |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9802 "SOPInstanceUID": "1.2.840.113619.2.176.2025.1499492.7040.1171286241.705" |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9803 }, |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9804 "Force": True |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9805 }), |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9806 'application/json') |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9807 upload1b = DoPost(_REMOTE, '/instances', modified, 'application/dicom') |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9808 changes1b = GetAllStableStudyChangesIds(upload1b["ParentStudy"], 4) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9809 self.assertEqual(upload1["ParentStudy"], upload1b["ParentStudy"]) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9810 self.assertEqual(1, len(changes1b)) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9811 self.assertNotEqual(changes1[0], changes1b[0]) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9812 |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9813 |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9814 if True: |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9815 DropOrthanc(_REMOTE) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9816 upload1 = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm') |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9817 # StableAge is set to 1, expect a StableStudy within 4 seconds |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9818 changes1 = GetAllStableStudyChangesIds(upload1["ParentStudy"], 4) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9819 self.assertEqual(1, len(changes1)) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9820 |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9821 # upload a new instance in the same study and check a second StableStudy change has been generated with a new id |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9822 upload2 = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0003.dcm') |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9823 changes2 = GetAllStableStudyChangesIds(upload2["ParentStudy"], 4) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9824 self.assertEqual(upload1["ParentStudy"], upload2["ParentStudy"]) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9825 self.assertEqual(2, len(changes2)) |
|
5dca7ef42156
added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents:
512
diff
changeset
|
9826 self.assertEqual(changes1[0], changes2[0]) |
| 516 | 9827 |
| 513 | 9828 def test_labels(self): |
| 523 | 9829 def CheckAllLabels(expected): |
| 9830 actual = DoGet(_REMOTE, '/tools/labels') | |
| 9831 self.assertEqual(len(actual), len(expected)) | |
| 9832 for i in expected: | |
| 9833 self.assertTrue(i in actual) | |
| 9834 for i in actual: | |
| 9835 self.assertTrue(i in expected) | |
| 9836 | |
|
517
692f2956ddab
test HasLabels in /system
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
516
diff
changeset
|
9837 if (IsOrthancVersionAbove(_REMOTE, 1, 12, 0) and |
|
692f2956ddab
test HasLabels in /system
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
516
diff
changeset
|
9838 DoGet(_REMOTE, '/system') ['HasLabels']): |
| 513 | 9839 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
| 9840 patient = DoGet(_REMOTE, '/instances/%s/patient' % u) ['ID'] | |
| 9841 study = DoGet(_REMOTE, '/instances/%s/study' % u) ['ID'] | |
| 9842 series = DoGet(_REMOTE, '/instances/%s/series' % u) ['ID'] | |
| 9843 | |
| 9844 for base in [ '/instances/%s' % u, | |
| 9845 '/series/%s' % series, | |
| 9846 '/studies/%s' % study, | |
|
519
b1991073e4d1
test alphanumeric labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
518
diff
changeset
|
9847 '/patients/%s' % patient ]: |
| 521 | 9848 |
| 9849 # no tags by default | |
| 513 | 9850 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels'])) |
| 523 | 9851 CheckAllLabels([]) |
| 521 | 9852 |
| 9853 # 404 if requesting a tag that does apply for a resource | |
| 513 | 9854 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '%s/labels/hello' % base)) |
| 521 | 9855 |
| 9856 # delete a non existing tag does not generate an error | |
| 513 | 9857 self.assertEqual('', DoDelete(_REMOTE, '%s/labels/hello' % base)) |
| 9858 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels'])) | |
| 521 | 9859 |
| 9860 # Not an alphanumeric label -> 400 | |
| 9861 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '%s/labels/@' % base)) | |
| 9862 | |
| 9863 # add a tag | |
| 513 | 9864 self.assertEqual('', DoPut(_REMOTE, '%s/labels/hello' % base)) |
| 521 | 9865 self.assertEqual(1, len(DoGet(_REMOTE, base) ['Labels'])) |
| 9866 self.assertEqual('hello', DoGet(_REMOTE, base) ['Labels'][0]) | |
| 523 | 9867 CheckAllLabels([ 'hello' ]) |
| 521 | 9868 |
| 9869 # double tagging does not generate any error | |
| 9870 self.assertEqual('', DoPut(_REMOTE, '%s/labels/hello' % base)) | |
| 9871 self.assertEqual('', DoGet(_REMOTE, '%s/labels/hello' % base)) | |
| 9872 self.assertEqual(1, len(DoGet(_REMOTE, base) ['Labels'])) | |
| 9873 self.assertEqual('hello', DoGet(_REMOTE, base) ['Labels'][0]) | |
| 9874 | |
| 9875 # add a second tag | |
| 9876 self.assertEqual('', DoPut(_REMOTE, '%s/labels/world' % base)) | |
| 9877 self.assertEqual('', DoGet(_REMOTE, '%s/labels/world' % base)) | |
| 513 | 9878 self.assertEqual('', DoGet(_REMOTE, '%s/labels/hello' % base)) |
| 521 | 9879 self.assertEqual(2, len(DoGet(_REMOTE, base) ['Labels'])) |
| 9880 self.assertIn(DoGet(_REMOTE, base) ['Labels'][0], ['hello', 'world']) | |
| 9881 self.assertIn(DoGet(_REMOTE, base) ['Labels'][1], ['hello', 'world']) | |
| 523 | 9882 CheckAllLabels([ 'hello', 'world' ]) |
| 521 | 9883 |
| 9884 # delete the first tag | |
| 513 | 9885 self.assertEqual('', DoDelete(_REMOTE, '%s/labels/hello' % base)) |
| 521 | 9886 self.assertEqual(1, len(DoGet(_REMOTE, base) ['Labels'])) |
| 9887 self.assertEqual('world', DoGet(_REMOTE, base) ['Labels'][0]) | |
| 9888 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '%s/labels/hello' % base)) | |
| 523 | 9889 CheckAllLabels([ 'world' ]) |
| 521 | 9890 |
| 9891 # delete the second tag | |
| 9892 self.assertEqual('', DoDelete(_REMOTE, '%s/labels/world' % base)) | |
| 513 | 9893 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels'])) |
| 521 | 9894 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '%s/labels/world' % base)) |
| 523 | 9895 CheckAllLabels([ ]) |
| 521 | 9896 |
| 9897 # test all valid chars | |
| 523 | 9898 VALID = r'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-' |
| 9899 self.assertEqual('', DoPut(_REMOTE, '%s/labels/%s' % (base, VALID))) | |
| 9900 CheckAllLabels([ VALID ]) | |
| 9901 DoDelete(_REMOTE, '%s/labels/%s' % (base, VALID)) | |
| 9902 CheckAllLabels([ ]) | |
| 9903 | |
|
517
692f2956ddab
test HasLabels in /system
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
516
diff
changeset
|
9904 else: |
|
692f2956ddab
test HasLabels in /system
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
516
diff
changeset
|
9905 print("Your database backend doesn't support labels") |
|
518
43a323de0b02
added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
517
diff
changeset
|
9906 |
|
43a323de0b02
added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
517
diff
changeset
|
9907 def test_find_labels(self): |
| 548 | 9908 def Execute(labels, constraint, query = { }, level='Instance'): |
| 9909 return DoPost(_REMOTE, '/tools/find', { 'Level' : level, | |
| 525 | 9910 'Query' : query, |
|
522
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9911 'Labels' : labels, |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9912 'LabelsConstraint' : constraint, }) |
|
518
43a323de0b02
added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
517
diff
changeset
|
9913 |
|
43a323de0b02
added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
517
diff
changeset
|
9914 if (IsOrthancVersionAbove(_REMOTE, 1, 12, 0) and |
|
43a323de0b02
added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
517
diff
changeset
|
9915 DoGet(_REMOTE, '/system') ['HasLabels']): |
| 548 | 9916 u = UploadInstance(_REMOTE, 'DummyCT.dcm') |
| 9917 studyId = u["ParentStudy"] | |
| 9918 seriesId = u["ParentSeries"] | |
| 9919 patientId = u["ParentPatient"] | |
| 9920 u = u["ID"] | |
| 9921 self.assertEqual(1, len(Execute([ 'a' ], 'None'))) | |
|
518
43a323de0b02
added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
517
diff
changeset
|
9922 |
|
522
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9923 # The instance has no label |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9924 self.assertEqual(1, len(Execute([], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9925 self.assertEqual(1, len(Execute([], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9926 self.assertEqual(1, len(Execute([], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9927 self.assertEqual(0, len(Execute([ 'a' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9928 self.assertEqual(0, len(Execute([ 'a' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9929 self.assertEqual(1, len(Execute([ 'a' ], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9930 self.assertEqual(0, len(Execute([ 'b' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9931 self.assertEqual(0, len(Execute([ 'b' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9932 self.assertEqual(1, len(Execute([ 'b' ], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9933 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9934 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9935 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'None'))) |
|
518
43a323de0b02
added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
517
diff
changeset
|
9936 |
|
43a323de0b02
added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
517
diff
changeset
|
9937 DoPut(_REMOTE, '/instances/%s/labels/a' % u) |
|
522
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9938 # The instance has label "a" |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9939 self.assertEqual(1, len(Execute([], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9940 self.assertEqual(1, len(Execute([], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9941 self.assertEqual(1, len(Execute([], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9942 self.assertEqual(1, len(Execute([ 'a' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9943 self.assertEqual(1, len(Execute([ 'a' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9944 self.assertEqual(0, len(Execute([ 'a' ], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9945 self.assertEqual(0, len(Execute([ 'b' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9946 self.assertEqual(0, len(Execute([ 'b' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9947 self.assertEqual(1, len(Execute([ 'b' ], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9948 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9949 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9950 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'None'))) |
|
518
43a323de0b02
added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
517
diff
changeset
|
9951 |
| 525 | 9952 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'PatientID' : 'nope' }))) |
| 9953 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'PatientID' : '' }))) | |
| 9954 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'StudyInstanceUID' : 'nope' }))) | |
| 9955 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'StudyInstanceUID' : '' }))) | |
| 9956 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'SeriesInstanceUID' : 'nope' }))) | |
| 9957 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'SeriesInstanceUID' : '' }))) | |
| 9958 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'SOPInstanceUID' : 'nope' }))) | |
| 9959 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'SOPInstanceUID' : '' }))) | |
| 9960 | |
| 9961 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'PatientID' : 'ozp00SjY2xG' }))) | |
| 9962 | |
| 9963 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390' }))) | |
| 9964 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394' }))) | |
| 9965 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'SOPInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' }))) | |
| 9966 self.assertEqual(1, len(Execute([ 'a' ], 'All', { | |
| 9967 'PatientID' : 'ozp00SjY2xG', | |
| 9968 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 9969 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 9970 'SOPInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', | |
| 9971 }))) | |
| 9972 | |
| 9973 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'PatientID' : 'nope' }))) | |
| 9974 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'PatientID' : '' }))) | |
| 9975 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'StudyInstanceUID' : 'nope' }))) | |
| 9976 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'StudyInstanceUID' : '' }))) | |
| 9977 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SeriesInstanceUID' : 'nope' }))) | |
| 9978 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SeriesInstanceUID' : '' }))) | |
| 9979 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SOPInstanceUID' : 'nope' }))) | |
| 9980 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SOPInstanceUID' : '' }))) | |
| 9981 | |
| 9982 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'PatientID' : 'ozp00SjY2xG' }))) | |
| 9983 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390' }))) | |
| 9984 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394' }))) | |
| 9985 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SOPInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' }))) | |
| 9986 self.assertEqual(0, len(Execute([ 'b' ], 'All', { | |
| 9987 'PatientID' : 'ozp00SjY2xG', | |
| 9988 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 9989 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 9990 'SOPInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', | |
| 9991 }))) | |
| 9992 | |
|
518
43a323de0b02
added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
517
diff
changeset
|
9993 DoPut(_REMOTE, '/instances/%s/labels/b' % u) |
|
522
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9994 # The instance has labels "a" and "b" |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9995 self.assertEqual(1, len(Execute([], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9996 self.assertEqual(1, len(Execute([], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9997 self.assertEqual(1, len(Execute([], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9998 self.assertEqual(1, len(Execute([ 'a' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
9999 self.assertEqual(1, len(Execute([ 'a' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10000 self.assertEqual(0, len(Execute([ 'a' ], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10001 self.assertEqual(1, len(Execute([ 'b' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10002 self.assertEqual(1, len(Execute([ 'b' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10003 self.assertEqual(0, len(Execute([ 'b' ], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10004 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10005 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10006 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'None'))) |
| 524 | 10007 self.assertEqual(0, len(Execute([ 'b', 'c' ], 'All'))) |
| 10008 self.assertEqual(1, len(Execute([ 'b', 'c' ], 'Any'))) | |
| 10009 self.assertEqual(0, len(Execute([ 'b', 'c' ], 'None'))) | |
| 10010 self.assertEqual(0, len(Execute([ 'c', 'd' ], 'All'))) | |
| 10011 self.assertEqual(0, len(Execute([ 'c', 'd' ], 'Any'))) | |
| 10012 self.assertEqual(1, len(Execute([ 'c', 'c' ], 'None'))) | |
|
518
43a323de0b02
added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
517
diff
changeset
|
10013 |
|
43a323de0b02
added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
517
diff
changeset
|
10014 DoDelete(_REMOTE, '/instances/%s/labels/a' % u) |
|
522
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10015 # The instance has label "b" |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10016 self.assertEqual(1, len(Execute([], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10017 self.assertEqual(1, len(Execute([], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10018 self.assertEqual(1, len(Execute([], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10019 self.assertEqual(0, len(Execute([ 'a' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10020 self.assertEqual(0, len(Execute([ 'a' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10021 self.assertEqual(1, len(Execute([ 'a' ], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10022 self.assertEqual(1, len(Execute([ 'b' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10023 self.assertEqual(1, len(Execute([ 'b' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10024 self.assertEqual(0, len(Execute([ 'b' ], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10025 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10026 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10027 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10028 |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10029 DoDelete(_REMOTE, '/instances/%s/labels/b' % u) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10030 # The instance has no more label |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10031 self.assertEqual(1, len(Execute([], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10032 self.assertEqual(1, len(Execute([], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10033 self.assertEqual(1, len(Execute([], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10034 self.assertEqual(0, len(Execute([ 'a' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10035 self.assertEqual(0, len(Execute([ 'a' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10036 self.assertEqual(1, len(Execute([ 'a' ], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10037 self.assertEqual(0, len(Execute([ 'b' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10038 self.assertEqual(0, len(Execute([ 'b' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10039 self.assertEqual(1, len(Execute([ 'b' ], 'None'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10040 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'All'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10041 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'Any'))) |
|
fce9e90acdc2
replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
521
diff
changeset
|
10042 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'None'))) |
| 548 | 10043 |
| 10044 | |
| 10045 # tests at series levels (make sure to test only with series levels and with multiple levels) | |
| 10046 DoPut(_REMOTE, '/series/%s/labels/b' % seriesId) | |
| 10047 self.assertEqual(1, len(Execute([ 'a' ], 'None', { | |
| 10048 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394' | |
| 10049 }, 'Series'))) | |
| 10050 self.assertEqual(0, len(Execute([ 'a' ], 'Any', { | |
| 10051 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394' | |
| 10052 }, 'Series'))) | |
| 10053 self.assertEqual(1, len(Execute([ 'b' ], 'Any', { | |
| 10054 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394' | |
| 10055 }, 'Series'))) | |
| 10056 self.assertEqual(1, len(Execute([ 'b' ], 'All', { | |
| 10057 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394' | |
| 10058 }, 'Series'))) | |
| 10059 self.assertEqual(1, len(Execute([ 'a' ], 'None', { | |
| 10060 'PatientID' : 'ozp00SjY2xG', | |
| 10061 }, 'Series'))) | |
| 10062 self.assertEqual(0, len(Execute([ 'a' ], 'Any', { | |
| 10063 'PatientID' : 'ozp00SjY2xG', | |
| 10064 }, 'Series'))) | |
| 10065 self.assertEqual(1, len(Execute([ 'b' ], 'Any', { | |
| 10066 'PatientID' : 'ozp00SjY2xG', | |
| 10067 }, 'Series'))) | |
| 10068 self.assertEqual(1, len(Execute([ 'b' ], 'All', { | |
| 10069 'PatientID' : 'ozp00SjY2xG', | |
| 10070 }, 'Series'))) | |
| 10071 | |
| 10072 # tests at study levels (make sure to test only with study levels and with multiple levels) | |
| 10073 DoPut(_REMOTE, '/studies/%s/labels/b' % studyId) | |
| 10074 self.assertEqual(1, len(Execute([ 'a' ], 'None', { | |
| 10075 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390' | |
| 10076 }, 'Study'))) | |
| 10077 self.assertEqual(0, len(Execute([ 'a' ], 'Any', { | |
| 10078 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390' | |
| 10079 }, 'Study'))) | |
| 10080 self.assertEqual(1, len(Execute([ 'b' ], 'Any', { | |
| 10081 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390' | |
| 10082 }, 'Study'))) | |
| 10083 self.assertEqual(1, len(Execute([ 'b' ], 'All', { | |
| 10084 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390' | |
| 10085 }, 'Study'))) | |
| 10086 self.assertEqual(1, len(Execute([ 'a' ], 'None', { | |
| 10087 'PatientID' : 'ozp00SjY2xG', | |
| 10088 }, 'Study'))) | |
| 10089 self.assertEqual(0, len(Execute([ 'a' ], 'Any', { | |
| 10090 'PatientID' : 'ozp00SjY2xG', | |
| 10091 }, 'Study'))) | |
| 10092 self.assertEqual(1, len(Execute([ 'b' ], 'Any', { | |
| 10093 'PatientID' : 'ozp00SjY2xG', | |
| 10094 }, 'Study'))) | |
| 10095 self.assertEqual(1, len(Execute([ 'b' ], 'All', { | |
| 10096 'PatientID' : 'ozp00SjY2xG', | |
| 10097 }, 'Study'))) | |
| 10098 | |
| 10099 # tests at patient levels | |
| 10100 DoPut(_REMOTE, '/patients/%s/labels/b' % patientId) | |
| 10101 self.assertEqual(1, len(Execute([ 'a' ], 'None', { | |
| 10102 'PatientID' : 'ozp00SjY2xG', | |
| 10103 }, 'Patient'))) | |
| 10104 self.assertEqual(0, len(Execute([ 'a' ], 'Any', { | |
| 10105 'PatientID' : 'ozp00SjY2xG', | |
| 10106 }, 'Patient'))) | |
| 10107 self.assertEqual(1, len(Execute([ 'b' ], 'Any', { | |
| 10108 'PatientID' : 'ozp00SjY2xG', | |
| 10109 }, 'Patient'))) | |
| 10110 self.assertEqual(1, len(Execute([ 'b' ], 'All', { | |
| 10111 'PatientID' : 'ozp00SjY2xG', | |
| 10112 }, 'Patient'))) | |
| 10113 | |
|
518
43a323de0b02
added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
517
diff
changeset
|
10114 else: |
|
43a323de0b02
added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
517
diff
changeset
|
10115 print("Your database backend doesn't support labels") |
|
527
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10116 |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10117 |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10118 def test_numeric_metadata(self): |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10119 if IsOrthancVersionAbove(_REMOTE, 1, 12, 0): |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10120 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10121 study = DoGet(_REMOTE, '/instances/%s/study' % instance)['ID'] |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10122 |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10123 m = DoGet(_REMOTE, '/studies/%s/metadata' % study) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10124 self.assertEqual(2, len(m)) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10125 self.assertTrue('LastUpdate' in m) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10126 self.assertTrue('MainDicomTagsSignature' in m) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10127 lastUpdate = DoGet(_REMOTE, '/studies/%s/metadata/%s' % (study, 'LastUpdate')) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10128 signature = DoGet(_REMOTE, '/studies/%s/metadata/%s' % (study, 'MainDicomTagsSignature')) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10129 |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10130 m = DoGet(_REMOTE, '/studies/%s/metadata?numeric' % study) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10131 self.assertEqual(2, len(m)) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10132 self.assertTrue(7 in m) # MetadataType_LastUpdate |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10133 self.assertTrue(15 in m) # MetadataType_MainDicomTagsSignature |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10134 self.assertEqual(lastUpdate, DoGet(_REMOTE, '/studies/%s/metadata/%d' % (study, 7))) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10135 self.assertEqual(signature, DoGet(_REMOTE, '/studies/%s/metadata/%d' % (study, 15))) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10136 |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10137 m = DoGet(_REMOTE, '/studies/%s/metadata?expand' % study) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10138 self.assertEqual(2, len(m)) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10139 self.assertTrue('LastUpdate' in m) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10140 self.assertTrue('MainDicomTagsSignature' in m) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10141 self.assertEqual(lastUpdate, m['LastUpdate']) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10142 self.assertEqual(signature, m['MainDicomTagsSignature']) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10143 |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10144 m = DoGet(_REMOTE, '/studies/%s/metadata?expand&numeric' % study) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10145 self.assertEqual(2, len(m)) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10146 self.assertTrue('7' in m) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10147 self.assertTrue('15' in m) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10148 self.assertEqual(lastUpdate, m['7']) |
|
86456045ac80
added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
526
diff
changeset
|
10149 self.assertEqual(signature, m['15']) |
|
535
31f70bfd86a7
Fix orphan files remaining in storage when working with MaximumStorageSize
Alain Mazy <am@osimis.io>
parents:
533
diff
changeset
|
10150 |
|
584
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10151 def test_expand(self): |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10152 # test new expand options introduced in 1.12.2 |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10153 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2): |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10154 r = UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10155 instanceId = r['ID'] |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10156 seriesId = r['ParentSeries'] |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10157 studyId = r['ParentStudy'] |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10158 |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10159 self.assertEqual(DoGet(_REMOTE, '/instances?expand'), DoGet(_REMOTE, '/instances?expand=true')) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10160 self.assertEqual(DoGet(_REMOTE, '/instances'), DoGet(_REMOTE, '/instances?expand=false')) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10161 |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10162 self.assertEqual(DoGet(_REMOTE, '/series?expand'), DoGet(_REMOTE, '/series?expand=true')) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10163 self.assertEqual(DoGet(_REMOTE, '/series'), DoGet(_REMOTE, '/series?expand=false')) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10164 |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10165 self.assertEqual(DoGet(_REMOTE, '/studies?expand'), DoGet(_REMOTE, '/studies?expand=true')) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10166 self.assertEqual(DoGet(_REMOTE, '/studies'), DoGet(_REMOTE, '/studies?expand=false')) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10167 |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10168 r = DoGet(_REMOTE, '/studies/%s/instances?expand=true' % studyId) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10169 self.assertEqual(1, len(r)) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10170 self.assertIn('MainDicomTags', r[0]) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10171 |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10172 r = DoGet(_REMOTE, '/studies/%s/instances?expand=false' % studyId) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10173 self.assertEqual(1, len(r)) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10174 self.assertIn('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', r[0]) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10175 |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10176 self.assertEqual(DoGet(_REMOTE, '/studies/%s/instances?expand' % studyId), DoGet(_REMOTE, '/studies/%s/instances?expand=true' % studyId)) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10177 self.assertEqual(DoGet(_REMOTE, '/studies/%s/instances' % studyId), DoGet(_REMOTE, '/studies/%s/instances?expand=true' % studyId)) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10178 |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10179 r = DoGet(_REMOTE, '/studies/%s/series?expand=true' % studyId) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10180 self.assertEqual(1, len(r)) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10181 self.assertIn('MainDicomTags', r[0]) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10182 |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10183 r = DoGet(_REMOTE, '/studies/%s/series?expand=false' % studyId) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10184 self.assertEqual(1, len(r)) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10185 self.assertIn('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', r[0]) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10186 |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10187 self.assertEqual(DoGet(_REMOTE, '/studies/%s/series?expand' % studyId), DoGet(_REMOTE, '/studies/%s/series?expand=true' % studyId)) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10188 self.assertEqual(DoGet(_REMOTE, '/studies/%s/series' % studyId), DoGet(_REMOTE, '/studies/%s/series?expand=true' % studyId)) |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10189 |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10190 |
|
c4f4b0bc908b
new tests for new expand GET arguments
Alain Mazy <am@osimis.io>
parents:
583
diff
changeset
|
10191 |
|
535
31f70bfd86a7
Fix orphan files remaining in storage when working with MaximumStorageSize
Alain Mazy <am@osimis.io>
parents:
533
diff
changeset
|
10192 def test_add_attachment_to_non_existing_resource(self): |
|
31f70bfd86a7
Fix orphan files remaining in storage when working with MaximumStorageSize
Alain Mazy <am@osimis.io>
parents:
533
diff
changeset
|
10193 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1): # till 1.12.0, it returned a 200 |
|
31f70bfd86a7
Fix orphan files remaining in storage when working with MaximumStorageSize
Alain Mazy <am@osimis.io>
parents:
533
diff
changeset
|
10194 (headers, body) = DoPutRaw(_REMOTE, '/instances/11111111-11111111-11111111-11111111-11111111/attachments/1025', 'hello') |
|
31f70bfd86a7
Fix orphan files remaining in storage when working with MaximumStorageSize
Alain Mazy <am@osimis.io>
parents:
533
diff
changeset
|
10195 self.assertEqual('404', headers['status']) |
|
538
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10196 |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10197 def test_delete_updates_parents_last_update_metadata(self): |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10198 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1): |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10199 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm') |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10200 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm') |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10201 |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10202 #instanceLastUpdate1 = DoGet(_REMOTE, '/instances/%s/metadata/LastUpdate' % i['ID']) |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10203 seriesLastUpdate1 = DoGet(_REMOTE, '/series/%s/metadata/LastUpdate' % i['ParentSeries']) |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10204 studyLastUpdate1 = DoGet(_REMOTE, '/studies/%s/metadata/LastUpdate' % i['ParentStudy']) |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10205 patientLastUpdate1 = DoGet(_REMOTE, '/patients/%s/metadata/LastUpdate' % i['ParentPatient']) |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10206 |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10207 time.sleep(1.01) |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10208 DoDelete(_REMOTE, '/instances/%s' % j['ID']) |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10209 |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10210 #instanceLastUpdate2 = DoGet(_REMOTE, '/instances/%s/metadata/LastUpdate' % i['ID']) |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10211 seriesLastUpdate2 = DoGet(_REMOTE, '/series/%s/metadata/LastUpdate' % i['ParentSeries']) |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10212 studyLastUpdate2 = DoGet(_REMOTE, '/studies/%s/metadata/LastUpdate' % i['ParentStudy']) |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10213 patientLastUpdate2 = DoGet(_REMOTE, '/patients/%s/metadata/LastUpdate' % i['ParentPatient']) |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10214 |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10215 #self.assertEqual(instanceLastUpdate1, instanceLastUpdate2) |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10216 self.assertNotEqual(seriesLastUpdate1, seriesLastUpdate2) |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10217 self.assertNotEqual(studyLastUpdate1, studyLastUpdate2) |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10218 self.assertNotEqual(patientLastUpdate1, patientLastUpdate2) |
|
7a83a8f087c7
LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents:
535
diff
changeset
|
10219 |
|
554
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10220 def test_pixel_data_vr(self): |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10221 def Check(path, hasPixelData, hasMetadata, expectedVR): |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10222 i = UploadInstance(_REMOTE, path) ['ID'] |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10223 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i) |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10224 if hasMetadata: |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10225 self.assertTrue('PixelDataVR' in m) |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10226 self.assertEqual(expectedVR, m['PixelDataVR']) |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10227 else: |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10228 self.assertFalse('PixelDataVR' in m) |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10229 |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10230 if hasPixelData: |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10231 self.assertTrue('PixelDataOffset' in m) |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10232 j = DoGet(_REMOTE, '/instances/%s/file?expand' % i, headers = { |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10233 'Accept': 'application/dicom+json' |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10234 }) |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10235 self.assertEqual(expectedVR, j['7FE00010']['vr']) |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10236 |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10237 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1): |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10238 # File without pixel data |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10239 Check('MarekLatin2.dcm', False, False, None) |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10240 |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10241 # Those files are badly formatted, and should be 'OB' |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10242 # according to the DICOM standard => medata is present |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10243 Check('Issue143.dcm', True, True, 'OW') # Little Endian Explicit, 8bpp |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10244 Check('KarstenHilbertRF.dcm', True, True, 'OW') # Little Endian Explicit, 8bpp |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10245 Check('PilatesArgenturGEUltrasoundOsiriX.dcm', True, True, 'OW') # Little Endian Explicit, 8bpp |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10246 |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10247 # Those files are formatted as expected |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10248 Check('ColorTestMalaterre.dcm', True, False, 'OW') # Implicit Little Endian, 8bpp |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10249 Check('Issue94.dcm', True, False, 'OW') # Implicit Little Endian, 16bpp |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10250 Check('TransferSyntaxes/1.2.840.10008.1.2.1.dcm', True, False, 'OB') # Explicit Little Endian, 8bpp |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10251 Check('Phenix/IM-0001-0001.dcm', True, False, 'OW') # Explicit Little Endian, 16bpp |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10252 Check('TransferSyntaxes/1.2.840.10008.1.2.2.dcm', True, False, 'OB') # Explicit Big Endian, 8bpp |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10253 Check('TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm', True, False, 'OB') # JPEG |
|
ede184638961
added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
548
diff
changeset
|
10254 Check('Knee/T1/IM-0001-0001.dcm', True, False, 'OB') # JPEG2k |
|
565
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10255 |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10256 def test_encapsulate_stl(self): |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10257 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1): |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10258 stl = b'Hello, world' |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10259 |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10260 i = DoPost(_REMOTE, '/tools/create-dicom', json.dumps({ |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10261 'Content' : 'data:model/stl;base64,%s' % base64.b64encode(stl).decode(), |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10262 'Force' : True, |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10263 'Tags' : { |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10264 'PatientName' : 'Jodogne' |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10265 } |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10266 })) ['ID'] |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10267 |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10268 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10269 self.assertEqual('Jodogne', tags['PatientName']) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10270 self.assertEqual('M3D', tags['Modality']) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10271 self.assertEqual('model/stl', tags['MIMETypeOfEncapsulatedDocument']) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10272 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.3', tags['SOPClassUID']) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10273 |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10274 i = DoPost(_REMOTE, '/tools/create-dicom', json.dumps({ |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10275 'Content' : 'data:model/mtl;base64,%s' % base64.b64encode(stl).decode(), |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10276 'Tags' : {} |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10277 })) ['ID'] |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10278 |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10279 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10280 self.assertFalse('PatientName' in tags) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10281 self.assertEqual('M3D', tags['Modality']) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10282 self.assertEqual('model/mtl', tags['MIMETypeOfEncapsulatedDocument']) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10283 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.5', tags['SOPClassUID']) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10284 |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10285 i = DoPost(_REMOTE, '/tools/create-dicom', json.dumps({ |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10286 'Content' : 'data:model/obj;base64,%s' % base64.b64encode(stl).decode(), |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10287 'Tags' : {} |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10288 })) ['ID'] |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10289 |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10290 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10291 self.assertFalse('PatientName' in tags) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10292 self.assertEqual('M3D', tags['Modality']) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10293 self.assertEqual('model/obj', tags['MIMETypeOfEncapsulatedDocument']) |
|
855c3720902a
added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
557
diff
changeset
|
10294 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.4', tags['SOPClassUID']) |
| 591 | 10295 |
| 10296 | |
| 10297 def test_error_codes_content_type(self): | |
| 10298 | |
| 10299 # from 1.12.2, check that a ContentType header is included in errors with an error description (ex: 404) | |
| 10300 (headers, body) = DoGetRaw(_REMOTE, '/rnm94%3Cscript%3Ealert(1)%3C/script%3Ejdtkc/explorer.html') | |
| 10301 self.assertEqual('404', headers['status']) | |
| 10302 | |
| 10303 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2): | |
|
595
b6c1f0c9ca15
fix test_error_codes_content_type
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
591
diff
changeset
|
10304 self.assertEqual('text/plain', headers['content-type']) |
| 591 | 10305 |
| 10306 (headers, body) = DoPutRaw(_REMOTE, '/system', 'hello') | |
| 10307 self.assertEqual('405', headers['status']) | |
| 10308 # when there is no body, there is no content-type | |
| 10309 self.assertNotIn('content-type', headers) | |
| 10310 | |
| 10311 # responses with bodies contain x-content-type-options | |
| 10312 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2): | |
| 10313 (headers, body) = DoGetRaw(_REMOTE, '/system') | |
| 10314 self.assertIn('nosniff', headers['x-content-type-options']) | |
| 603 | 10315 |
| 10316 def test_modify_with_labels(self): | |
| 10317 | |
| 606 | 10318 if DoGet(_REMOTE, '/system')['ApiVersion'] < 23 or not DoGet(_REMOTE, '/system')['HasLabels']: |
| 10319 return | |
| 10320 | |
| 603 | 10321 def UploadAndLabel(testId): |
| 10322 DropOrthanc(_REMOTE) | |
| 10323 | |
| 10324 u = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 10325 studyId = u["ParentStudy"] | |
| 10326 seriesId = u["ParentSeries"] | |
| 10327 patientId = u["ParentPatient"] | |
| 10328 instanceId = u["ID"] | |
| 10329 | |
| 10330 if testId == 2: # multi instance study | |
| 10331 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm') | |
| 10332 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 10333 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm') | |
| 10334 | |
| 10335 # add a label to the study before modification | |
| 10336 DoPut(_REMOTE, '/patients/%s/labels/label-patient' % patientId) | |
| 10337 DoPut(_REMOTE, '/studies/%s/labels/label-study' % studyId) | |
| 10338 DoPut(_REMOTE, '/series/%s/labels/label-series' % seriesId) | |
| 10339 DoPut(_REMOTE, '/instances/%s/labels/label-instance' % instanceId) | |
| 10340 | |
| 10341 originalPatient = DoGet(_REMOTE, '/patients/%s' % patientId) | |
| 10342 self.assertEqual(1, len(originalPatient["Labels"])) | |
| 10343 self.assertIn('label-patient', originalPatient["Labels"]) | |
| 10344 | |
| 10345 originalStudy = DoGet(_REMOTE, '/studies/%s' % studyId) | |
| 10346 self.assertEqual(1, len(originalStudy["Labels"])) | |
| 10347 self.assertIn('label-study', originalStudy["Labels"]) | |
| 10348 | |
| 10349 originalSeries = DoGet(_REMOTE, '/series/%s' % seriesId) | |
| 10350 self.assertEqual(1, len(originalSeries["Labels"])) | |
| 10351 self.assertIn('label-series', originalSeries["Labels"]) | |
| 10352 | |
| 10353 originalInstance = DoGet(_REMOTE, '/instances/%s' % instanceId) | |
| 10354 self.assertEqual(1, len(originalInstance["Labels"])) | |
| 10355 self.assertIn('label-instance', originalInstance["Labels"]) | |
| 10356 | |
| 10357 return originalPatient, originalStudy, originalSeries, originalInstance | |
| 10358 | |
| 10359 | |
| 10360 for testId in range(1, 2): #test with a single instance study and a multi instance study | |
| 10361 | |
| 10362 originalPatient, originalStudy, originalSeries, originalInstance = UploadAndLabel(testId) | |
| 10363 | |
| 10364 # modify a study in place with no label field in the payload (default behavior before 1.12.3) | |
| 10365 DoPost(_REMOTE, '/studies/%s/modify' % originalStudy['ID'], { | |
| 10366 'Keep' : ['StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID'], | |
| 10367 'Replace' : { | |
| 10368 'PatientName': 'modified' | |
| 10369 }, | |
| 10370 'Force': True | |
| 10371 }) | |
| 10372 | |
| 10373 # with no options, all resources lose their labels during the modification | |
| 10374 modifiedStudy = DoGet(_REMOTE, '/studies/%s' % originalStudy['ID']) | |
| 10375 self.assertEqual(0, len(modifiedStudy["Labels"])) | |
| 10376 self.assertEqual('modified', modifiedStudy["PatientMainDicomTags"]["PatientName"]) | |
| 10377 | |
| 605 | 10378 if IsOrthancVersionAbove(_REMOTE, 1, 12, 3) and DoGet(_REMOTE, '/system')['ApiVersion'] >= 23 and DoGet(_REMOTE, '/system')['HasLabels']: |
| 603 | 10379 for testId in range(1, 2): #test with a single instance study and a multi instance study |
| 10380 | |
| 10381 originalPatient, originalStudy, originalSeries, originalInstance = UploadAndLabel(testId) | |
| 10382 | |
| 10383 # modify a study in place with no label field in the payload (default behavior before 1.12.3) | |
| 10384 DoPost(_REMOTE, '/studies/%s/modify' % originalStudy['ID'], { | |
| 10385 'Keep' : ['StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID'], | |
| 10386 'Replace' : { | |
| 10387 'PatientName': 'modified2' | |
| 10388 }, | |
| 10389 'Force': True, | |
| 10390 'KeepLabels': True | |
| 10391 }) | |
| 10392 | |
| 10393 # now, each resource level shall have kept its labels | |
| 10394 | |
| 10395 modifiedInstance = DoGet(_REMOTE, '/instances/%s' % originalInstance['ID']) | |
| 10396 self.assertEqual(1, len(modifiedInstance["Labels"])) | |
| 10397 self.assertIn('label-instance', modifiedInstance["Labels"]) | |
| 10398 | |
| 10399 modifiedSeries = DoGet(_REMOTE, '/series/%s' % originalSeries['ID']) | |
| 10400 self.assertEqual(1, len(modifiedSeries["Labels"])) | |
| 10401 self.assertIn('label-series', modifiedSeries["Labels"]) | |
| 10402 | |
| 10403 modifiedStudy = DoGet(_REMOTE, '/studies/%s' % originalStudy['ID']) | |
| 10404 self.assertEqual(1, len(modifiedStudy["Labels"])) | |
| 10405 self.assertIn('label-study', modifiedStudy["Labels"]) | |
| 10406 self.assertEqual('modified2', modifiedStudy["PatientMainDicomTags"]["PatientName"]) | |
| 10407 | |
| 10408 modifiedPatient = DoGet(_REMOTE, '/patients/%s' % originalPatient['ID']) | |
| 10409 self.assertEqual(1, len(modifiedPatient["Labels"])) | |
| 10410 self.assertIn('label-patient', modifiedPatient["Labels"]) | |
| 10411 | |
| 626 | 10412 def test_findscu_group_length(self): |
| 10413 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm') | |
| 10414 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0001.dcm') | |
| 10415 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0002.dcm') | |
| 10416 | |
| 10417 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', '0008,0000=22' ]) # GE like C-Find that includes group-length | |
| 10418 # print(i) | |
| 10419 s = re.findall('\(0008,0000\).*?\[(.*?)\]', i) | |
| 10420 self.assertEqual(0, len(s)) | |
|
646
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10421 |
|
652
dfd42a6c13fa
added test_tags_after_pixel_data
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
649
diff
changeset
|
10422 |
|
dfd42a6c13fa
added test_tags_after_pixel_data
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
649
diff
changeset
|
10423 def test_tags_after_pixel_data(self): |
| 653 | 10424 if IsOrthancVersionAbove(_REMOTE, 1, 12, 4): |
| 10425 # https://discourse.orthanc-server.org/t/private-tags-with-group-7fe0-are-not-provided-via-rest-api/4744 | |
| 10426 u = UploadInstance(_REMOTE, '2024-05-30-GuillemVela.dcm') ['ID'] | |
| 10427 | |
| 10428 a = DoGet(_REMOTE, '/instances/%s/tags' % u) | |
| 10429 self.assertFalse('8e05,1000' in a) | |
| 10430 | |
| 10431 a = DoGet(_REMOTE, '/instances/%s/tags?whole' % u) | |
| 10432 self.assertTrue('8e05,1000' in a) | |
| 10433 self.assertEqual('XEOS_Attributes', a['8e05,0010']['Value']) | |
| 10434 self.assertEqual('acquisition', a['8e05,1000']['Value']) | |
| 10435 self.assertEqual('specimen', a['8e05,1001']['Value']) | |
| 10436 | |
| 10437 a = DoGet(_REMOTE, '/instances/%s/tags?full' % u) | |
| 10438 self.assertFalse('8e05,1000' in a) | |
| 10439 | |
| 10440 a = DoGet(_REMOTE, '/instances/%s/tags?full&whole' % u) | |
| 10441 self.assertTrue('8e05,1000' in a) | |
| 10442 self.assertEqual('XEOS_Attributes', a['8e05,0010']['Value']) | |
| 10443 self.assertEqual('acquisition', a['8e05,1000']['Value']) | |
| 10444 self.assertEqual('specimen', a['8e05,1001']['Value']) | |
| 10445 | |
| 10446 a = DoGet(_REMOTE, '/instances/%s/tags?short' % u) | |
| 10447 self.assertFalse('8e05,1000' in a) | |
| 10448 | |
| 10449 a = DoGet(_REMOTE, '/instances/%s/tags?short&whole' % u) | |
| 10450 self.assertTrue('8e05,1000' in a) | |
| 10451 self.assertEqual('XEOS_Attributes', a['8e05,0010']) | |
| 10452 self.assertEqual('acquisition', a['8e05,1000']) | |
| 10453 self.assertEqual('specimen', a['8e05,1001']) | |
| 10454 | |
| 10455 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % u) | |
| 10456 self.assertFalse('Unknown Tag & Data' in a) | |
| 10457 | |
| 10458 a = DoGet(_REMOTE, '/instances/%s/tags?simplify&whole' % u) | |
| 10459 self.assertTrue('Unknown Tag & Data' in a) | |
| 10460 | |
| 10461 a = DoGet(_REMOTE, '/instances/%s/simplified-tags' % u) | |
| 10462 self.assertFalse('Unknown Tag & Data' in a) | |
| 10463 | |
| 10464 a = DoGet(_REMOTE, '/instances/%s/simplified-tags?whole' % u) | |
| 10465 self.assertTrue('Unknown Tag & Data' in a) | |
|
652
dfd42a6c13fa
added test_tags_after_pixel_data
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
649
diff
changeset
|
10466 |
|
dfd42a6c13fa
added test_tags_after_pixel_data
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
649
diff
changeset
|
10467 |
|
646
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10468 def test_requested_tags(self): |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10469 u = UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10470 |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10471 def CheckPatientContent(patient): |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10472 self.assertEqual(u['ParentPatient'], patient['ID']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10473 self.assertEqual('Patient', patient['Type']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10474 self.assertFalse(patient['IsStable']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10475 self.assertEqual(0, len(patient['Labels'])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10476 self.assertTrue('LastUpdate' in patient) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10477 self.assertEqual(2, len(patient['MainDicomTags'])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10478 self.assertEqual('ozp00SjY2xG', patient['MainDicomTags']['PatientID']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10479 self.assertEqual('KNIX', patient['MainDicomTags']['PatientName']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10480 self.assertEqual(1, len(patient['Studies'])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10481 self.assertEqual(u['ParentStudy'], patient['Studies'][0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10482 |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10483 def CheckStudyContent(study): |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10484 self.assertEqual(u['ParentStudy'], study['ID']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10485 self.assertEqual(u['ParentPatient'], study['ParentPatient']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10486 self.assertEqual('Study', study['Type']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10487 self.assertFalse(study['IsStable']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10488 self.assertEqual(0, len(study['Labels'])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10489 self.assertTrue('LastUpdate' in study) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10490 self.assertEqual(7, len(study['MainDicomTags'])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10491 self.assertEqual('0ECJ52puWpVIjTuhnBA0um', study['MainDicomTags']['InstitutionName']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10492 self.assertEqual('1', study['MainDicomTags']['ReferringPhysicianName']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10493 self.assertEqual('20070101', study['MainDicomTags']['StudyDate']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10494 self.assertEqual('Knee (R)', study['MainDicomTags']['StudyDescription']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10495 self.assertEqual('1', study['MainDicomTags']['StudyID']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10496 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', study['MainDicomTags']['StudyInstanceUID']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10497 self.assertEqual('120000.000000', study['MainDicomTags']['StudyTime']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10498 self.assertEqual(2, len(study['PatientMainDicomTags'])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10499 self.assertEqual('ozp00SjY2xG', study['PatientMainDicomTags']['PatientID']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10500 self.assertEqual('KNIX', study['PatientMainDicomTags']['PatientName']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10501 self.assertEqual(1, len(study['Series'])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10502 self.assertEqual(u['ParentSeries'], study['Series'][0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10503 |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10504 def CheckSeriesContent(series): |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10505 self.assertEqual(None, series['ExpectedNumberOfInstances']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10506 self.assertEqual('Unknown', series['Status']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10507 self.assertEqual(u['ParentSeries'], series['ID']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10508 self.assertEqual(u['ParentStudy'], series['ParentStudy']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10509 self.assertEqual('Series', series['Type']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10510 self.assertFalse(series['IsStable']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10511 self.assertEqual(0, len(series['Labels'])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10512 self.assertTrue('LastUpdate' in series) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10513 self.assertEqual(13, len(series['MainDicomTags'])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10514 self.assertEqual('0', series['MainDicomTags']['CardiacNumberOfImages']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10515 self.assertEqual('0.999841\\0.000366209\\0.0178227\\-0.000427244\\0.999995\\0.00326545', series['MainDicomTags']['ImageOrientationPatient']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10516 self.assertEqual('24', series['MainDicomTags']['ImagesInAcquisition']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10517 self.assertEqual('GE MEDICAL SYSTEMS', series['MainDicomTags']['Manufacturer']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10518 self.assertEqual('MR', series['MainDicomTags']['Modality']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10519 self.assertEqual('ca', series['MainDicomTags']['OperatorsName']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10520 self.assertEqual('324-58-2995/6', series['MainDicomTags']['ProtocolName']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10521 self.assertEqual('20070101', series['MainDicomTags']['SeriesDate']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10522 self.assertEqual('AX. FSE PD', series['MainDicomTags']['SeriesDescription']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10523 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', series['MainDicomTags']['SeriesInstanceUID']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10524 self.assertEqual('5', series['MainDicomTags']['SeriesNumber']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10525 self.assertEqual('120000.000000', series['MainDicomTags']['SeriesTime']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10526 self.assertEqual('TWINOW', series['MainDicomTags']['StationName']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10527 self.assertEqual(1, len(series['Instances'])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10528 self.assertEqual(u['ID'], series['Instances'][0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10529 |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10530 def CheckInstanceContent(instance): |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10531 self.assertEqual(2472, instance['FileSize']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10532 self.assertTrue('FileUuid' in instance) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10533 self.assertEqual(u['ID'], instance['ID']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10534 self.assertEqual(u['ParentSeries'], instance['ParentSeries']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10535 self.assertEqual('Instance', instance['Type']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10536 self.assertEqual(1, instance['IndexInSeries']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10537 self.assertEqual(0, len(instance['Labels'])) |
| 691 | 10538 # if IsOrthancVersionAbove(_REMOTE, 1, 12, 5): |
| 10539 # self.assertEqual(8, len(instance['MainDicomTags'])) # since we have added SOPClassUID | |
| 10540 # else: | |
|
646
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10541 self.assertEqual(7, len(instance['MainDicomTags'])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10542 self.assertEqual('1', instance['MainDicomTags']['AcquisitionNumber']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10543 self.assertEqual('0.999841\\0.000366209\\0.0178227\\-0.000427244\\0.999995\\0.00326545', instance['MainDicomTags']['ImageOrientationPatient']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10544 self.assertEqual('-149.033\\-118.499\\-61.0464', instance['MainDicomTags']['ImagePositionPatient']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10545 self.assertEqual('20070101', instance['MainDicomTags']['InstanceCreationDate']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10546 self.assertEqual('120000.000000', instance['MainDicomTags']['InstanceCreationTime']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10547 self.assertEqual('1', instance['MainDicomTags']['InstanceNumber']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10548 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', instance['MainDicomTags']['SOPInstanceUID']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10549 |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10550 def CheckRequestedTags(resource): |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10551 self.assertEqual(6, len(resource['RequestedTags'])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10552 self.assertEqual('ozp00SjY2xG', resource['RequestedTags']['PatientID']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10553 self.assertEqual('Knee (R)', resource['RequestedTags']['StudyDescription']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10554 self.assertEqual('AX. FSE PD', resource['RequestedTags']['SeriesDescription']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10555 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', resource['RequestedTags']['SOPClassUID']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10556 self.assertEqual('2800', resource['RequestedTags']['RepetitionTime']) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10557 self.assertEqual(3, len(resource['RequestedTags']['DerivationCodeSequence'][0])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10558 self.assertEqual('121327', resource['RequestedTags']['DerivationCodeSequence'][0]['CodeValue']) |
| 693 | 10559 |
|
646
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10560 requestedTags = 'PatientID;StudyDescription;SeriesDescription;SOPClassUID;RepetitionTime;DerivationCodeSequence' |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10561 |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10562 a = DoGet(_REMOTE, '/patients?expand') |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10563 self.assertEqual(1, len(a)) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10564 self.assertEqual(7, len(a[0])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10565 CheckPatientContent(a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10566 self.assertFalse('RequestedTags' in a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10567 |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10568 a = DoGet(_REMOTE, '/patients?expand&requestedTags=%s' % requestedTags) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10569 self.assertEqual(1, len(a)) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10570 self.assertEqual(8, len(a[0])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10571 CheckPatientContent(a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10572 CheckRequestedTags(a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10573 |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10574 a = DoGet(_REMOTE, '/studies?expand') |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10575 self.assertEqual(1, len(a)) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10576 self.assertEqual(9, len(a[0])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10577 CheckStudyContent(a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10578 self.assertFalse('RequestedTags' in a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10579 |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10580 a = DoGet(_REMOTE, '/studies?expand&requestedTags=%s' % requestedTags) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10581 self.assertEqual(1, len(a)) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10582 self.assertEqual(10, len(a[0])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10583 CheckStudyContent(a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10584 CheckRequestedTags(a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10585 |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10586 a = DoGet(_REMOTE, '/series?expand') |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10587 self.assertEqual(1, len(a)) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10588 self.assertEqual(10, len(a[0])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10589 CheckSeriesContent(a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10590 self.assertFalse('RequestedTags' in a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10591 |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10592 a = DoGet(_REMOTE, '/series?expand&requestedTags=%s' % requestedTags) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10593 self.assertEqual(1, len(a)) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10594 self.assertEqual(11, len(a[0])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10595 CheckSeriesContent(a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10596 CheckRequestedTags(a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10597 |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10598 a = DoGet(_REMOTE, '/instances?expand') |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10599 self.assertEqual(1, len(a)) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10600 self.assertEqual(8, len(a[0])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10601 CheckInstanceContent(a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10602 self.assertFalse('RequestedTags' in a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10603 |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10604 a = DoGet(_REMOTE, '/instances?expand&requestedTags=%s' % requestedTags) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10605 self.assertEqual(1, len(a)) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10606 self.assertEqual(9, len(a[0])) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10607 CheckInstanceContent(a[0]) |
|
0daf680aa3cc
added test_requested_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
640
diff
changeset
|
10608 CheckRequestedTags(a[0]) |
|
647
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10609 |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10610 a = DoGet(_REMOTE, '/patients/%s' % u['ParentPatient']) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10611 self.assertEqual(7, len(a)) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10612 CheckPatientContent(a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10613 self.assertFalse('RequestedTags' in a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10614 |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10615 a = DoGet(_REMOTE, '/patients/%s?requestedTags=%s' % (u['ParentPatient'], requestedTags)) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10616 self.assertEqual(8, len(a)) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10617 CheckPatientContent(a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10618 CheckRequestedTags(a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10619 |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10620 a = DoGet(_REMOTE, '/studies/%s' % u['ParentStudy']) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10621 self.assertEqual(9, len(a)) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10622 CheckStudyContent(a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10623 self.assertFalse('RequestedTags' in a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10624 |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10625 a = DoGet(_REMOTE, '/studies/%s?requestedTags=%s' % (u['ParentStudy'], requestedTags)) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10626 self.assertEqual(10, len(a)) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10627 CheckStudyContent(a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10628 CheckRequestedTags(a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10629 |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10630 a = DoGet(_REMOTE, '/series/%s' % u['ParentSeries']) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10631 self.assertEqual(10, len(a)) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10632 CheckSeriesContent(a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10633 self.assertFalse('RequestedTags' in a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10634 |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10635 a = DoGet(_REMOTE, '/series/%s?requestedTags=%s' % (u['ParentSeries'], requestedTags)) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10636 self.assertEqual(11, len(a)) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10637 CheckSeriesContent(a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10638 CheckRequestedTags(a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10639 |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10640 a = DoGet(_REMOTE, '/instances/%s' % u['ID']) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10641 self.assertEqual(8, len(a)) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10642 CheckInstanceContent(a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10643 self.assertFalse('RequestedTags' in a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10644 |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10645 a = DoGet(_REMOTE, '/instances/%s?requestedTags=%s' % (u['ID'], requestedTags)) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10646 self.assertEqual(9, len(a)) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10647 CheckInstanceContent(a) |
|
5ee7be1be006
test expansion of single resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
646
diff
changeset
|
10648 CheckRequestedTags(a) |
|
661
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10649 |
| 693 | 10650 # this is equivalent to calling /dicom-web/series?PatientID=* |
| 10651 # when there are no StudyInstanceUID specified, the DICOM-Web standard says we should retrieve all Series and Study tags | |
| 10652 # which includes e.g. NumberOfStudyRelatedInstances (0020,1208) that is a computed tag at study level | |
| 10653 c = GetStorageAccessesCount(_REMOTE) | |
| 10654 a = DoPost(_REMOTE, '/tools/find', { | |
| 10655 "Query": { "PatientID": "*"}, | |
| 10656 "Level": "Series", | |
| 10657 "Expand": True, | |
| 10658 "RequestedTags": [ | |
| 10659 "0008,0020", | |
| 10660 "0008,0030", | |
| 10661 "0008,0050", | |
| 10662 "0008,0056", | |
| 10663 "0008,0060", | |
| 10664 "0008,0061", | |
| 10665 "0008,0090", | |
| 10666 "0008,0201", | |
| 10667 "0008,103e", | |
| 10668 "0010,0010", | |
| 10669 "0010,0020", | |
| 10670 "0010,0030", | |
| 10671 "0010,0040", | |
| 10672 "0020,000d", | |
| 10673 "0020,000e", | |
| 10674 "0020,0010", | |
| 10675 "0020,0011", | |
| 10676 "0020,1206", | |
| 10677 "0020,1208", | |
| 10678 "0020,1209", | |
| 10679 "0040,0244", | |
| 10680 "0040,0245", | |
| 10681 "0040,0275" | |
| 10682 ] | |
| 10683 }) | |
| 10684 # Up to now, no versions of Orthanc ever returned this value but we keep the test for later (let's wait for someone to comlain !) | |
| 10685 self.assertNotIn("NumberOfStudyRelatedInstances", a[0]["RequestedTags"]) | |
| 10686 if HasExtendedFind(_REMOTE): | |
| 10687 self.assertEqual(c, GetStorageAccessesCount(_REMOTE)) # the disk shall not have been accessed | |
| 10688 | |
| 10689 c = GetStorageAccessesCount(_REMOTE) | |
| 10690 a = DoPost(_REMOTE, '/tools/find', { | |
| 10691 "Query": { "PatientID": "*"}, | |
| 10692 "Level": "Study", | |
| 10693 "Expand": True, | |
| 10694 "RequestedTags": [ | |
| 10695 "SOPClassesInStudy", | |
| 10696 "NumberOfStudyRelatedInstances" | |
| 10697 ] | |
| 10698 }) | |
| 10699 # Up to now, no versions of Orthanc ever returned this value but we keep the test for later (let's wait for someone to comlain !) | |
| 10700 self.assertIn("SOPClassesInStudy", a[0]["RequestedTags"]) | |
| 10701 self.assertIn("NumberOfStudyRelatedInstances", a[0]["RequestedTags"]) | |
| 10702 if HasExtendedFind(_REMOTE): | |
| 10703 self.assertEqual(c, GetStorageAccessesCount(_REMOTE)) # the disk shall not have been accessed | |
| 10704 | |
| 10705 | |
|
661
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10706 |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10707 def test_computed_tags(self): |
| 662 | 10708 # curl 'http://alice:orthanctest@localhost:8042/patients/0946fcb6-cf12ab43-bad958c1-bf057ad5-0fc6f54c?requested-tags=0020,1200;0020,1202;0020,1204' |
| 10709 # curl 'http://alice:orthanctest@localhost:8042/studies/6c65289b-db2fcb71-7eaf73f4-8e12470c-a4d6d7cf?requested-tags=0008,0061;0008,0062;0020,1206;0020,1208' | |
| 10710 # curl 'http://alice:orthanctest@localhost:8042/series/318603c5-03e8cffc-a82b6ee1-3ccd3c1e-18d7e3bb?requested-tags=0020,1209' | |
| 10711 # curl 'http://alice:orthanctest@localhost:8042/instances/ee693caa-9786a685-4f0f9fb0-4411cc8b-988f5574?requested-tags=0008,0056' | |
| 10712 | |
|
661
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10713 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm') |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10714 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0002.dcm') |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10715 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0001.dcm') |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10716 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0002.dcm') |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10717 |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10718 instance = 'ee693caa-9786a685-4f0f9fb0-4411cc8b-988f5574' |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10719 series = '318603c5-03e8cffc-a82b6ee1-3ccd3c1e-18d7e3bb' |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10720 study = '6c65289b-db2fcb71-7eaf73f4-8e12470c-a4d6d7cf' |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10721 patient = '0946fcb6-cf12ab43-bad958c1-bf057ad5-0fc6f54c' |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10722 |
| 685 | 10723 if IsOrthancVersionAbove(_REMOTE, 1, 12, 4): # the old syntax is still required for the upgrade/downgrade PG tests |
| 10724 a = DoGet(_REMOTE, '/instances/%s?requested-tags=0008,0056' % instance) | |
| 10725 else: | |
| 10726 a = DoGet(_REMOTE, '/instances/%s?RequestedTags=0008,0056' % instance) | |
| 10727 | |
|
661
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10728 self.assertEqual(1, len(a['RequestedTags'])) |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10729 self.assertEqual('ONLINE', a['RequestedTags']['InstanceAvailability']) |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10730 |
| 685 | 10731 if IsOrthancVersionAbove(_REMOTE, 1, 12, 4): |
| 10732 a = DoGet(_REMOTE, '/series/%s?requested-tags=0020,1209' % series) | |
| 10733 else: | |
| 10734 a = DoGet(_REMOTE, '/series/%s?RequestedTags=0020,1209' % series) | |
|
661
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10735 self.assertEqual(1, len(a['RequestedTags'])) |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10736 self.assertEqual(2, int(a['RequestedTags']['NumberOfSeriesRelatedInstances'])) |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10737 |
| 685 | 10738 if IsOrthancVersionAbove(_REMOTE, 1, 12, 4): |
| 10739 a = DoGet(_REMOTE, '/studies/%s?requested-tags=0008,0061;0008,0062;0020,1206;0020,1208' % study) | |
| 10740 else: | |
| 10741 a = DoGet(_REMOTE, '/studies/%s?RequestedTags=0008,0061;0008,0062;0020,1206;0020,1208' % study) | |
| 10742 | |
|
661
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10743 self.assertEqual(4, len(a['RequestedTags'])) |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10744 self.assertEqual('CT\\PT', a['RequestedTags']['ModalitiesInStudy']) |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10745 self.assertEqual('1.2.840.10008.5.1.4.1.1.128\\1.2.840.10008.5.1.4.1.1.2', a['RequestedTags']['SOPClassesInStudy']) |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10746 self.assertEqual(2, int(a['RequestedTags']['NumberOfStudyRelatedSeries'])) |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10747 self.assertEqual(4, int(a['RequestedTags']['NumberOfStudyRelatedInstances'])) |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10748 |
| 685 | 10749 if IsOrthancVersionAbove(_REMOTE, 1, 12, 4): |
| 10750 a = DoGet(_REMOTE, '/patients/%s?requested-tags=0020,1200;0020,1202;0020,1204' % patient) | |
| 10751 else: | |
| 10752 a = DoGet(_REMOTE, '/studies/%s?RequestedTags=0020,1200;0020,1202;0020,1204' % study) | |
|
661
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10753 self.assertEqual(3, len(a['RequestedTags'])) |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10754 self.assertEqual(1, int(a['RequestedTags']['NumberOfPatientRelatedStudies'])) |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10755 self.assertEqual(2, int(a['RequestedTags']['NumberOfPatientRelatedSeries'])) |
|
763e2ccbd0df
added test_computed_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
653
diff
changeset
|
10756 self.assertEqual(4, int(a['RequestedTags']['NumberOfPatientRelatedInstances'])) |
| 663 | 10757 |
| 10758 def test_computed_tags_and_patient_comments(self): | |
| 10759 UploadInstance(_REMOTE, 'WithEmptyPatientComments.dcm') | |
| 10760 | |
| 10761 # without requesting PatientComments, we get the computed tags | |
| 10762 i = CallFindScu([ '-k', 'PatientID=WITH_COMMENTS', '-k', 'QueryRetrieveLevel=Study', '-k', 'ModalitiesInStudy', '-k', 'NumberOfStudyRelatedSeries', '-k', 'NumberOfStudyRelatedInstances' ]) | |
| 10763 modalitiesInStudy = re.findall('\(0008,0061\).*?\[(.*?)\]', i) | |
| 10764 self.assertEqual(1, len(modalitiesInStudy)) | |
| 10765 self.assertEqual('CT', modalitiesInStudy[0]) | |
| 10766 | |
| 664 | 10767 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5): |
| 663 | 10768 # when requesting PatientComments, with 1.12.4, we did not get the computed tags |
| 10769 i = CallFindScu([ '-k', 'PatientID=WITH_COMMENTS', '-k', 'QueryRetrieveLevel=Study', '-k', 'ModalitiesInStudy', '-k', 'NumberOfStudyRelatedSeries', '-k', 'NumberOfStudyRelatedInstances', '-k', 'PatientComments' ]) | |
| 10770 modalitiesInStudy = re.findall('\(0008,0061\).*?\[(.*?)\]', i) | |
| 10771 self.assertEqual(1, len(modalitiesInStudy)) | |
| 10772 self.assertEqual('CT', modalitiesInStudy[0]) | |
| 10773 numberOfStudyRelatedSeries = re.findall('\(0020,1206\).*?\[(.*?)\]', i) | |
| 10774 self.assertEqual(1, len(numberOfStudyRelatedSeries)) | |
| 10775 self.assertEqual(1, int(numberOfStudyRelatedSeries[0])) | |
| 10776 numberOfStudyRelatedInstances = re.findall('\(0020,1208\).*?\[(.*?)\]', i) | |
| 10777 self.assertEqual(1, len(numberOfStudyRelatedInstances)) | |
| 10778 self.assertEqual(1, int(numberOfStudyRelatedInstances[0])) | |
| 10779 | |
| 10780 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 10781 'Expand': True, | |
| 10782 'Query' : { 'PatientID' : 'WITH_COMMENTS'}, | |
| 10783 'RequestedTags': ['ModalitiesInStudy', 'NumberOfStudyRelatedSeries', 'NumberOfStudyRelatedInstances', 'PatientComments']}) | |
| 10784 | |
| 10785 self.assertEqual(4, len(a[0]['RequestedTags'].keys())) | |
| 10786 self.assertEqual(1, int(a[0]['RequestedTags']['NumberOfStudyRelatedSeries'])) | |
| 10787 self.assertEqual(1, int(a[0]['RequestedTags']['NumberOfStudyRelatedInstances'])) | |
| 10788 self.assertEqual('CT', a[0]['RequestedTags']['ModalitiesInStudy']) | |
| 10789 self.assertEqual('', a[0]['RequestedTags']['PatientComments']) | |
| 710 | 10790 |
| 10791 | |
| 10792 def test_extended_find_order_by(self): | |
| 10793 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged | |
| 10794 | |
| 10795 # Upload 12 instances | |
| 10796 for i in range(3): | |
| 10797 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 10798 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 10799 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 10800 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 10801 | |
| 10802 kneeT2SeriesId = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' | |
| 10803 kneeT1SeriesId = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' | |
| 10804 brainixFlairSeriesId = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' | |
| 10805 brainixEpiSeriesId = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8' | |
| 10806 DoPut(_REMOTE, '/series/%s/metadata/my-metadata' % kneeT2SeriesId, 'kneeT2') | |
| 10807 DoPut(_REMOTE, '/series/%s/metadata/my-metadata' % kneeT1SeriesId, 'kneeT1') | |
| 10808 DoPut(_REMOTE, '/series/%s/metadata/my-metadata' % brainixFlairSeriesId, 'brainixFlair') | |
| 10809 DoPut(_REMOTE, '/series/%s/metadata/my-metadata' % brainixEpiSeriesId, 'brainixEpi') | |
| 10810 | |
| 712 | 10811 # order by resource tag |
| 10812 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 10813 'Expand': True, | |
| 10814 'Query' : { | |
| 10815 'PatientName' : '*' | |
| 10816 }, | |
| 10817 'OrderBy' : [ | |
| 10818 { | |
| 10819 'Type': 'DicomTag', | |
| 10820 'Key': 'PatientName', | |
| 10821 'Direction': 'ASC' | |
| 10822 } | |
| 10823 ] | |
| 10824 }) | |
| 10825 self.assertEqual(2, len(a)) | |
| 10826 self.assertEqual("BRAINIX", a[0]['PatientMainDicomTags']['PatientName']) | |
| 10827 | |
| 10828 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 10829 'Expand': True, | |
| 10830 'Query' : { | |
| 10831 'PatientName' : '*' | |
| 10832 }, | |
| 10833 'OrderBy' : [ | |
| 10834 { | |
| 10835 'Type': 'DicomTag', | |
| 10836 'Key': 'PatientName', | |
| 10837 'Direction': 'DESC' | |
| 10838 } | |
| 10839 ] | |
| 10840 }) | |
| 10841 | |
| 10842 self.assertEqual("BRAINIX", a[1]['PatientMainDicomTags']['PatientName']) | |
| 10843 | |
| 10844 # order by parent tag | |
| 10845 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 10846 'Expand': False, | |
| 10847 'Query' : { | |
| 10848 'SeriesDescription' : '*' | |
| 10849 }, | |
| 10850 'OrderBy' : [ | |
| 10851 { | |
| 10852 'Type': 'DicomTag', | |
| 10853 'Key': 'StudyDate', | |
| 10854 'Direction': 'ASC' | |
| 10855 } | |
| 10856 ] | |
| 10857 }) | |
| 10858 # knee StudyDate = 20080819 | |
| 10859 # brainix StudyDate = 20061201 | |
| 10860 self.assertEqual(4, len(a)) | |
| 10861 self.assertTrue(a[0] == brainixEpiSeriesId or a[0] == brainixFlairSeriesId) | |
| 10862 self.assertTrue(a[3] == kneeT1SeriesId or a[3] == kneeT2SeriesId) | |
| 10863 | |
| 10864 # order by parent tag and resource tag | |
| 10865 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 10866 'Expand': False, | |
| 10867 'Query' : { | |
| 10868 'SeriesDescription' : '*' | |
| 10869 }, | |
| 10870 'OrderBy' : [ | |
| 10871 { | |
| 10872 'Type': 'DicomTag', | |
| 10873 'Key': 'StudyDate', | |
| 10874 'Direction': 'ASC' | |
| 10875 }, | |
| 10876 { | |
| 10877 'Type': 'DicomTag', | |
| 10878 'Key': 'SeriesTime', | |
| 10879 'Direction': 'ASC' | |
| 10880 } | |
| 10881 ] | |
| 10882 }) | |
| 10883 # knee StudyDate = 20080819 | |
| 10884 # brainix StudyDate = 20061201 | |
| 10885 self.assertEqual(4, len(a)) | |
| 10886 self.assertEqual(brainixFlairSeriesId, a[0]) | |
| 10887 self.assertEqual(brainixEpiSeriesId, a[1]) | |
| 10888 self.assertEqual(kneeT1SeriesId, a[2]) | |
| 10889 self.assertEqual(kneeT2SeriesId, a[3]) | |
| 10890 | |
| 10891 # order by grandparent tag and resource tag | |
| 10892 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 10893 'Expand': False, | |
| 10894 'Query' : { | |
| 10895 'SeriesDescription' : '*' | |
| 10896 }, | |
| 10897 'OrderBy' : [ | |
| 10898 { | |
| 10899 'Type': 'DicomTag', | |
| 10900 'Key': 'PatientBirthDate', | |
| 10901 'Direction': 'ASC' | |
| 10902 }, | |
| 10903 { | |
| 10904 'Type': 'DicomTag', | |
| 10905 'Key': 'SeriesTime', | |
| 10906 'Direction': 'ASC' | |
| 10907 } | |
| 10908 ] | |
| 10909 }) | |
| 10910 # knee PatientBirthDate = 20080822 | |
| 10911 # brainix PatientBirthDate = 19490301 | |
| 10912 self.assertEqual(4, len(a)) | |
| 10913 self.assertEqual(brainixFlairSeriesId, a[0]) | |
| 10914 self.assertEqual(brainixEpiSeriesId, a[1]) | |
| 10915 self.assertEqual(kneeT1SeriesId, a[2]) | |
| 10916 self.assertEqual(kneeT2SeriesId, a[3]) | |
| 10917 | |
| 10918 # order by grandgrandparent tag and resource tag | |
| 10919 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', | |
| 10920 'Expand': True, | |
| 10921 'Query' : { | |
| 10922 }, | |
| 10923 'OrderBy' : [ | |
| 10924 { | |
| 10925 'Type': 'DicomTag', | |
| 10926 'Key': 'PatientBirthDate', | |
| 10927 'Direction': 'ASC' | |
| 10928 }, | |
| 10929 { | |
| 10930 'Type': 'DicomTag', | |
| 10931 'Key': 'InstanceNumber', | |
| 10932 'Direction': 'ASC' | |
| 10933 }, | |
| 10934 { | |
| 10935 'Type': 'DicomTag', | |
| 10936 'Key': 'SeriesTime', | |
| 10937 'Direction': 'ASC' | |
| 10938 } | |
| 10939 ], | |
| 10940 'RequestedTags' : ['PatientBirthDate', 'InstanceNumber', 'SeriesTime'] | |
| 10941 }) | |
| 10942 self.assertEqual(12, len(a)) | |
| 10943 for i in range(1, len(a)-1): | |
| 10944 self.assertTrue(a[i-1]['RequestedTags']['PatientBirthDate'] <= a[i]['RequestedTags']['PatientBirthDate']) | |
| 10945 if a[i-1]['RequestedTags']['PatientBirthDate'] == a[i]['RequestedTags']['PatientBirthDate']: | |
| 10946 self.assertTrue(a[i-1]['RequestedTags']['InstanceNumber'] <= a[i]['RequestedTags']['InstanceNumber']) | |
| 10947 if a[i-1]['RequestedTags']['InstanceNumber'] == a[i]['RequestedTags']['InstanceNumber']: | |
| 10948 self.assertTrue(a[i-1]['RequestedTags']['SeriesTime'] <= a[i]['RequestedTags']['SeriesTime']) | |
| 10949 | |
| 10950 # order by grandgrandparent tag and resource tag (2) | |
| 10951 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', | |
| 10952 'Expand': True, | |
| 10953 'Query' : { | |
| 10954 }, | |
| 10955 'OrderBy' : [ | |
| 10956 { | |
| 10957 'Type': 'DicomTag', | |
| 10958 'Key': 'InstanceNumber', | |
| 10959 'Direction': 'DESC' | |
| 10960 }, | |
| 10961 { | |
| 10962 'Type': 'DicomTag', | |
| 10963 'Key': 'PatientBirthDate', | |
| 10964 'Direction': 'ASC' | |
| 10965 }, | |
| 10966 { | |
| 10967 'Type': 'DicomTag', | |
| 10968 'Key': 'SeriesTime', | |
| 10969 'Direction': 'ASC' | |
| 10970 } | |
| 10971 ], | |
| 10972 'RequestedTags' : ['InstanceNumber', 'PatientBirthDate', 'SeriesTime' ] | |
| 10973 }) | |
| 10974 self.assertEqual(12, len(a)) | |
| 10975 for i in range(1, len(a)-1): | |
| 10976 self.assertTrue(a[i-1]['RequestedTags']['InstanceNumber'] >= a[i]['RequestedTags']['InstanceNumber']) | |
| 10977 if a[i-1]['RequestedTags']['InstanceNumber'] == a[i]['RequestedTags']['InstanceNumber']: | |
| 10978 self.assertTrue(a[i-1]['RequestedTags']['PatientBirthDate'] <= a[i]['RequestedTags']['PatientBirthDate']) | |
| 10979 if a[i-1]['RequestedTags']['PatientBirthDate'] == a[i]['RequestedTags']['PatientBirthDate']: | |
| 10980 self.assertTrue(a[i-1]['RequestedTags']['SeriesTime'] <= a[i]['RequestedTags']['SeriesTime']) | |
| 10981 | |
| 10982 # order by resource tag on a tag that is missing in one of the resources -> it should be listed | |
| 10983 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 10984 'Expand': False, | |
| 10985 'Query' : { | |
| 10986 }, | |
| 710 | 10987 |
| 712 | 10988 'OrderBy' : [ |
| 10989 { | |
| 10990 'Type': 'DicomTag', | |
| 716 | 10991 'Key': 'BodyPartExamined', # in Knee but not in Brainix => Brainix is last because NULL are pushed at the end |
| 712 | 10992 'Direction': 'ASC' |
| 10993 } | |
| 10994 ] | |
| 10995 }) | |
| 716 | 10996 self.assertTrue(a[0] == kneeT1SeriesId or a[0] == kneeT2SeriesId) |
| 10997 self.assertTrue(a[3] == brainixEpiSeriesId or a[3] == brainixFlairSeriesId) | |
| 712 | 10998 |
| 10999 # order by metadata | |
| 11000 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 11001 'Query' : { | |
| 11002 'SeriesDescription' : '*' | |
| 11003 }, | |
| 11004 'OrderBy' : [ | |
| 11005 { | |
| 11006 'Type': 'Metadata', | |
| 11007 'Key': 'my-metadata', | |
| 11008 'Direction': 'ASC' | |
| 11009 } | |
| 11010 ] | |
| 11011 }) | |
| 11012 self.assertEqual(brainixEpiSeriesId, a[0]) | |
| 11013 self.assertEqual(brainixFlairSeriesId, a[1]) | |
| 11014 self.assertEqual(kneeT1SeriesId, a[2]) | |
| 11015 self.assertEqual(kneeT2SeriesId, a[3]) | |
| 11016 | |
| 11017 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 11018 'Query' : { | |
| 11019 'SeriesDescription' : '*' | |
| 11020 }, | |
| 11021 'OrderBy' : [ | |
| 11022 { | |
| 11023 'Type': 'Metadata', | |
| 11024 'Key': 'my-metadata', | |
| 11025 'Direction': 'DESC' | |
| 11026 } | |
| 11027 ] | |
| 11028 }) | |
| 11029 self.assertEqual(brainixEpiSeriesId, a[3]) | |
| 11030 self.assertEqual(brainixFlairSeriesId, a[2]) | |
| 11031 self.assertEqual(kneeT1SeriesId, a[1]) | |
| 11032 self.assertEqual(kneeT2SeriesId, a[0]) | |
| 710 | 11033 |
| 11034 # combined ordering (DicomTag + metadata) | |
| 11035 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 11036 'Query' : { | |
| 11037 'SeriesDescription' : '*' | |
| 11038 }, | |
| 11039 'OrderBy' : [ | |
| 11040 { | |
| 11041 'Type': 'DicomTag', | |
| 11042 'Key': 'PatientName', | |
| 11043 'Direction': 'ASC' | |
| 11044 }, | |
| 11045 { | |
| 11046 'Type': 'Metadata', | |
| 11047 'Key': 'my-metadata', | |
| 11048 'Direction': 'DESC' | |
| 11049 } | |
| 11050 ] | |
| 11051 }) | |
| 11052 self.assertEqual(brainixFlairSeriesId, a[0]) | |
| 11053 self.assertEqual(brainixEpiSeriesId, a[1]) | |
| 11054 self.assertEqual(kneeT2SeriesId, a[2]) | |
| 11055 self.assertEqual(kneeT1SeriesId, a[3]) | |
| 11056 | |
| 11057 | |
| 11058 def test_extended_find_parent(self): | |
| 11059 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged | |
|
714
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11060 # Upload 12 instances |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11061 for i in range(3): |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11062 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11063 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11064 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11065 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11066 |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11067 kneeT2SeriesId = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11068 kneeT1SeriesId = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11069 kneeStudyId = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11070 kneePatientId = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11071 |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11072 # retrieve only the series from a study |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11073 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11074 'Query' : { |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11075 'SeriesDescription' : 'T*' |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11076 }, |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11077 'ParentStudy' : kneeStudyId |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11078 }) |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11079 |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11080 self.assertEqual(2, len(a)) |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11081 self.assertTrue(a[0] == kneeT1SeriesId or a[0] == kneeT2SeriesId) |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11082 |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11083 # retrieve only the series from a patient |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11084 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11085 'Query' : { |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11086 'SeriesDescription' : 'T*' |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11087 }, |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11088 'ParentPatient' : kneePatientId |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11089 }) |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11090 |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11091 self.assertEqual(2, len(a)) |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11092 self.assertTrue(a[0] == kneeT1SeriesId or a[0] == kneeT2SeriesId) |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11093 |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11094 # retrieve only the instances from a patient |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11095 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11096 'Query' : { |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11097 'SeriesDescription' : 'T*' |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11098 }, |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11099 'ParentPatient' : kneePatientId |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11100 }) |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11101 |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11102 self.assertEqual(6, len(a)) |
|
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11103 |
| 723 | 11104 # same query in count-resources |
| 11105 a = DoPost(_REMOTE, '/tools/count-resources', { 'Level' : 'Instance', | |
| 11106 'Query' : { | |
| 11107 'SeriesDescription' : 'T*' | |
| 11108 }, | |
| 11109 'ParentPatient' : kneePatientId | |
| 11110 }) | |
| 11111 | |
| 11112 self.assertEqual(6, a["Count"]) | |
| 11113 | |
|
714
812ad50c5564
tools/find: ParentPatient and co ..
Alain Mazy <am@orthanc.team>
parents:
713
diff
changeset
|
11114 |
|
715
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11115 def test_extended_find_filter_metadata(self): |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11116 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11117 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11118 # Upload 12 instances |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11119 for i in range(3): |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11120 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11121 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11122 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11123 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11124 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11125 kneeT2SeriesId = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11126 kneeT1SeriesId = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11127 brainixFlairSeriesId = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11128 brainixEpiSeriesId = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11129 DoPut(_REMOTE, '/series/%s/metadata/my-metadata' % kneeT2SeriesId, 'kneeT2') |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11130 DoPut(_REMOTE, '/series/%s/metadata/my-metadata' % kneeT1SeriesId, 'kneeT1') |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11131 DoPut(_REMOTE, '/series/%s/metadata/my-metadata' % brainixFlairSeriesId, 'brainixFlair') |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11132 DoPut(_REMOTE, '/series/%s/metadata/my-metadata' % brainixEpiSeriesId, 'brainixEpi') |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11133 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11134 # filter on metadata |
| 723 | 11135 q = { |
| 11136 'Level' : 'Series', | |
| 11137 'Query' : { | |
| 11138 'SeriesDescription' : 'T*' | |
| 11139 }, | |
| 11140 'MetadataQuery' : { | |
| 11141 'my-metadata': '*2*' | |
| 11142 } | |
| 11143 } | |
| 11144 a = DoPost(_REMOTE, '/tools/find', q) | |
|
715
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11145 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11146 self.assertEqual(1, len(a)) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11147 self.assertEqual(kneeT2SeriesId, a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11148 |
| 723 | 11149 a = DoPost(_REMOTE, '/tools/count-resources', q) |
| 11150 self.assertEqual(1, a["Count"]) | |
| 11151 | |
| 11152 | |
| 11153 | |
|
715
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11154 def test_extended_find_expand(self): |
| 710 | 11155 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged |
|
715
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11156 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11157 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11158 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11159 'Query' : { |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11160 'SeriesDescription' : 'T*' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11161 }, |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11162 'Expand': True, |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11163 'RequestedTags': ['StudyDate'] |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11164 }) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11165 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11166 # backward compat for Expand = True |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11167 self.assertIn('ExpectedNumberOfInstances', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11168 self.assertIn('ID', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11169 self.assertIn('Instances', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11170 self.assertIn('Labels', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11171 self.assertIn('LastUpdate', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11172 self.assertIn('MainDicomTags', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11173 self.assertIn('ParentStudy', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11174 self.assertIn('RequestedTags', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11175 self.assertIn('Status', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11176 self.assertIn('Type', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11177 self.assertIn('IsStable', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11178 self.assertNotIn('Attachments', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11179 self.assertNotIn('Metadata', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11180 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11181 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11182 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11183 'Query' : { |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11184 'SeriesDescription' : 'T*' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11185 }, |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11186 'ResponseContent': ["MainDicomTags"], |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11187 'RequestedTags': ['StudyDate'] |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11188 }) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11189 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11190 self.assertIn('ID', a[0]) # the ID is always in the response |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11191 self.assertIn('Type', a[0]) # the Type is always in the response |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11192 self.assertIn('RequestedTags', a[0]) # the RequestedTags are always in the response as soon as you have requested them |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11193 self.assertIn('MainDicomTags', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11194 self.assertNotIn('ExpectedNumberOfInstances', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11195 self.assertNotIn('Instances', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11196 self.assertNotIn('Labels', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11197 self.assertNotIn('LastUpdate', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11198 self.assertNotIn('ParentStudy', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11199 self.assertNotIn('Status', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11200 self.assertNotIn('IsStable', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11201 self.assertNotIn('Attachments', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11202 self.assertNotIn('Metadata', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11203 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11204 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11205 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11206 'Query' : { |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11207 'SeriesDescription' : 'T*' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11208 }, |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11209 'ResponseContent': ["MainDicomTags", "Children", "Parent", "IsStable", "Status", "Labels", "Metadata"], |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11210 'RequestedTags': ['StudyDate'] |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11211 }) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11212 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11213 self.assertIn('ID', a[0]) # the ID is always in the response |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11214 self.assertIn('Type', a[0]) # the Type is always in the response |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11215 self.assertIn('RequestedTags', a[0]) # the RequestedTags are always in the response as soon as you have requested them |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11216 self.assertIn('MainDicomTags', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11217 self.assertIn('Metadata', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11218 self.assertIn('LastUpdate', a[0]['Metadata']) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11219 self.assertIn('Instances', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11220 self.assertIn('Labels', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11221 self.assertIn('ParentStudy', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11222 self.assertIn('Status', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11223 self.assertIn('IsStable', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11224 self.assertNotIn('Attachments', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11225 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11226 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11227 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instances', |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11228 'Query' : { |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11229 'SeriesDescription' : 'T*' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11230 }, |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11231 'Expand': True, |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11232 'RequestedTags': ['StudyDate'] |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11233 }) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11234 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11235 # backward compat for Expand = True at instance level |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11236 self.assertIn('ID', a[0]) # the ID is always in the response |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11237 self.assertIn('Type', a[0]) # the Type is always in the response |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11238 self.assertIn('RequestedTags', a[0]) # the RequestedTags are always in the response as soon as you have requested them |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11239 self.assertIn('FileSize', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11240 self.assertIn('FileUuid', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11241 self.assertIn('IndexInSeries', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11242 self.assertIn('ParentSeries', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11243 self.assertIn('Labels', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11244 self.assertNotIn('Attachments', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11245 self.assertNotIn('Metadata', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11246 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11247 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instances', |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11248 'Query' : { |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11249 'SeriesDescription' : 'T*' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11250 }, |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11251 'ResponseContent' : ['Attachments'], |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11252 'RequestedTags': ['StudyDate'] |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11253 }) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11254 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11255 self.assertIn('ID', a[0]) # the ID is always in the response |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11256 self.assertIn('Type', a[0]) # the Type is always in the response |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11257 self.assertIn('RequestedTags', a[0]) # the RequestedTags are always in the response as soon as you have requested them |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11258 self.assertIn('Attachments', a[0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11259 self.assertIn('Uuid', a[0]['Attachments'][0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11260 self.assertIn('UncompressedSize', a[0]['Attachments'][0]) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11261 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11262 |
| 717 | 11263 # 'internal check': make sure we get the SOPClassUID even when we do not request the Metadata |
| 11264 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instances', | |
| 11265 'Query' : { | |
| 11266 'SeriesDescription' : 'T*' | |
| 11267 }, | |
| 11268 'ResponseContent' : [], | |
| 11269 'RequestedTags': ['SOPClassUID'] | |
| 11270 }) | |
| 11271 | |
| 11272 self.assertIn('ID', a[0]) # the ID is always in the response | |
| 11273 self.assertIn('Type', a[0]) # the Type is always in the response | |
| 11274 self.assertIn('RequestedTags', a[0]) # the RequestedTags are always in the response as soon as you have requested them | |
| 11275 self.assertIn('SOPClassUID', a[0]['RequestedTags']) | |
| 11276 | |
| 11277 | |
|
715
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11278 def test_extended_find_full(self): |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11279 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11280 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11281 # Upload 12 instances |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11282 for i in range(3): |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11283 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11284 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11285 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11286 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11287 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11288 kneeT2SeriesId = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11289 kneeT1SeriesId = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11290 brainixFlairSeriesId = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11291 brainixEpiSeriesId = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11292 kneeStudyId = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11293 kneePatientId = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11294 DoPut(_REMOTE, '/series/%s/metadata/my-metadata' % kneeT2SeriesId, 'kneeT2') |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11295 DoPut(_REMOTE, '/series/%s/metadata/my-metadata' % kneeT1SeriesId, 'kneeT1') |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11296 DoPut(_REMOTE, '/series/%s/metadata/my-metadata' % brainixFlairSeriesId, 'brainixFlair') |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11297 DoPut(_REMOTE, '/series/%s/metadata/my-metadata' % brainixEpiSeriesId, 'brainixEpi') |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11298 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11299 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11300 'Query' : { |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11301 'PatientName' : '*' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11302 }, |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11303 'RequestedTags': ['StudyDate'], |
|
721
43fd1686f4a2
renamed QueryMetadata into MetadataQuery
Alain Mazy <am@orthanc.team>
parents:
720
diff
changeset
|
11304 'MetadataQuery' : { |
|
715
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11305 'my-metadata': "*nee*" |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11306 }, |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11307 'OrderBy' : [ |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11308 { |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11309 'Type': 'DicomTag', |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11310 'Key': 'SeriesDescription', |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11311 'Direction': 'ASC' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11312 }, |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11313 { |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11314 'Type': 'Metadata', |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11315 'Key': 'my-metadata', |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11316 'Direction': 'DESC' |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11317 } |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11318 ], |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11319 'ParentPatient': kneePatientId, |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11320 'ResponseContent' : ['Parent', 'Children', 'MainDicomTags', 'Metadata'] |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11321 }) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11322 |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11323 self.assertEqual(2, len(a)) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11324 self.assertEqual(kneeT1SeriesId, a[0]['ID']) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11325 self.assertEqual(kneeT2SeriesId, a[1]['ID']) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11326 self.assertEqual(kneeStudyId, a[0]['ParentStudy']) |
|
c11496bd7eaa
tools/find: Metadata, ResponseContent
Alain Mazy <am@orthanc.team>
parents:
714
diff
changeset
|
11327 self.assertEqual(3, len(a[0]['Instances'])) |
|
719
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11328 self.assertEqual('', a[0]['Metadata']['RemoteAET']) |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11329 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11330 def test_pagination_and_limit_find_results(self): |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11331 # LimitFindInstances is set to 20 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11332 # LimitFindResults is set to 10 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11333 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11334 # Upload 27 instances from KNIX |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11335 UploadFolder(_REMOTE, 'Knix/Loc') |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11336 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11337 # Upload 13 other series |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11338 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11339 UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm') |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11340 UploadInstance(_REMOTE, 'Implicit-vr-us-palette.dcm') |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11341 UploadInstance(_REMOTE, 'Multiframe.dcm') |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11342 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11343 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11344 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11345 UploadInstance(_REMOTE, 'PrivateTags.dcm') |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11346 UploadInstance(_REMOTE, 'PrivateMDNTags.dcm') |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11347 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm') |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11348 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0001.dcm') |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11349 UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm') |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11350 UploadInstance(_REMOTE, 'Encodings/Lena-ascii.dcm') |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11351 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11352 self.assertEqual(14, len(DoGet(_REMOTE, '/series'))) |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11353 |
| 722 | 11354 |
|
719
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11355 knixInstancesNoLimit = DoPost(_REMOTE, '/tools/find', { |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11356 'Level' : 'Instances', |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11357 'Query' : { |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11358 'PatientName' : 'KNIX' |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11359 }, |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11360 'Expand': False |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11361 }) |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11362 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11363 # pprint.pprint(knixInstancesNoLimit) |
|
732
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11364 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): |
| 722 | 11365 self.assertEqual(20, len(knixInstancesNoLimit)) |
| 11366 else: | |
| 11367 self.assertEqual(21, len(knixInstancesNoLimit)) | |
|
719
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11368 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11369 knixInstancesSince5Limit20 = DoPost(_REMOTE, '/tools/find', { |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11370 'Level' : 'Instances', |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11371 'Query' : { |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11372 'PatientName' : 'KNIX' |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11373 }, |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11374 'Expand': False, |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11375 'Since': 5, |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11376 'Limit': 20 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11377 }) |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11378 # pprint.pprint(knixInstancesSince5Limit20) |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11379 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11380 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11381 self.assertEqual(20, len(knixInstancesSince5Limit20)) # Orthanc actually returns LimitFindInstances + 1 resources |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11382 # the first 5 from previous call shall not be in this answer |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11383 for i in range(0, 5): |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11384 self.assertNotIn(knixInstancesNoLimit[i], knixInstancesSince5Limit20) |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11385 # the last 4 from last call shall not be in the first answer |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11386 for i in range(16, 20): |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11387 self.assertNotIn(knixInstancesSince5Limit20[i], knixInstancesNoLimit) |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11388 |
| 720 | 11389 # request more instances than LimitFindInstances |
| 11390 knixInstancesSince0Limit23 = DoPost(_REMOTE, '/tools/find', { | |
| 11391 'Level' : 'Instances', | |
| 11392 'Query' : { | |
| 11393 'PatientName' : 'KNIX' | |
| 11394 }, | |
| 11395 'Expand': False, | |
| 11396 'Since': 0, | |
| 11397 'Limit': 23 | |
| 11398 }) | |
|
732
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11399 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): |
| 720 | 11400 self.assertEqual(20, len(knixInstancesSince0Limit23)) |
| 11401 | |
|
719
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11402 seriesNoLimit = DoPost(_REMOTE, '/tools/find', { |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11403 'Level' : 'Series', |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11404 'Query' : { |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11405 'PatientName' : '*' |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11406 }, |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11407 'Expand': False |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11408 }) |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11409 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11410 # pprint.pprint(seriesNoLimit) |
|
732
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11411 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): |
| 722 | 11412 self.assertEqual(10, len(seriesNoLimit)) |
| 11413 else: | |
| 11414 self.assertEqual(11, len(seriesNoLimit)) | |
|
719
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11415 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11416 seriesSince8Limit6 = DoPost(_REMOTE, '/tools/find', { |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11417 'Level' : 'Series', |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11418 'Query' : { |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11419 'PatientName' : '*' |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11420 }, |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11421 'Expand': False, |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11422 'Since': 8, |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11423 'Limit': 6 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11424 }) |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11425 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11426 # pprint.pprint(seriesSince8Limit6) |
|
732
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11427 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged and supported by all DB plugins !!! |
|
719
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11428 self.assertEqual(6, len(seriesSince8Limit6)) |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11429 |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11430 # the first 7 from previous call shall not be in this answer |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11431 for i in range(0, 7): |
| 720 | 11432 self.assertNotIn(seriesNoLimit[i], seriesSince8Limit6) |
|
719
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11433 # the last 3 from last call shall not be in the first answer |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11434 for i in range(3, 5): |
|
05e8e7043e05
limit find results + pagination tests
Alain Mazy <am@orthanc.team>
parents:
717
diff
changeset
|
11435 self.assertNotIn(seriesSince8Limit6[i], seriesNoLimit) |
| 722 | 11436 |
|
735
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11437 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): |
|
732
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11438 # query by a tag that is not in the DB (there are 27 instances from Knix/Loc + 10 instances from other series that satisfies this criteria) |
|
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11439 a = DoPost(_REMOTE, '/tools/find', { |
|
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11440 'Level' : 'Instances', |
|
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11441 'Query' : { |
|
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11442 'PhotometricInterpretation' : 'MONOCHROME*' |
|
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11443 }, |
|
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11444 'Expand': True, |
|
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11445 'OrderBy' : [ |
|
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11446 { |
|
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11447 'Type': 'DicomTag', |
|
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11448 'Key': 'InstanceNumber', |
|
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11449 'Direction': 'ASC' |
|
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11450 } |
|
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11451 ]}) |
|
0ba04367983e
fix pagination tests for PG, MySQL, ODBC
Alain Mazy <am@orthanc.team>
parents:
723
diff
changeset
|
11452 |
| 722 | 11453 # pprint.pprint(a) |
| 11454 # print(len(a)) | |
| 11455 # TODO: we should have something in the response that notifies us that the response is not "complete" | |
| 11456 # TODO: we should receive an error if we try to use "since" in this kind of search ? | |
|
735
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11457 self.assertEqual(17, len(a)) # the fast DB filtering returns 20 instances -> only 17 of them meet the criteria but this is not really correct !!! |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11458 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11459 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11460 # make sur an error is returned when using Since or Limit when querying a tag that is not in DB |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11461 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/tools/find', {'Level' : 'Instances', |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11462 'Query' : { |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11463 'PhotometricInterpretation' : 'MONOCHROME*' |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11464 }, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11465 'Since': 2 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11466 })) |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11467 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11468 # make sur an error is returned when using Since or Limit when querying a tag that is not in DB |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11469 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/tools/find', {'Level' : 'Instances', |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11470 'Query' : { |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11471 'PhotometricInterpretation' : 'MONOCHROME*' |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11472 }, |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11473 'Limit': 10 |
|
be8f174d3c9d
tools/find: Limit and Since are now forbidden when filtering on DICOM tags that are not stored in DB
Alain Mazy <am@orthanc.team>
parents:
732
diff
changeset
|
11474 })) |