annotate Tests/Tests.py @ 305:ed20ead1a8b6

test_store_peer_transcoding
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 19 May 2020 20:35:20 +0200
parents b8399213b840
children 2565d39dd36c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
1 #!/usr/bin/env python
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2 # -*- coding: utf-8 -*-
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
4
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 # Orthanc - A Lightweight, RESTful DICOM Store
73
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
6 # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 # Department, University Hospital of Liege, Belgium
260
943166deebcb upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 256
diff changeset
8 # Copyright (C) 2017-2020 Osimis S.A., Belgium
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 #
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 # This program is free software: you can redistribute it and/or
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 # modify it under the terms of the GNU General Public License as
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 # published by the Free Software Foundation, either version 3 of the
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 # License, or (at your option) any later version.
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 #
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 # This program is distributed in the hope that it will be useful, but
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 # WITHOUT ANY WARRANTY; without even the implied warranty of
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 # General Public License for more details.
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 #
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 # You should have received a copy of the GNU General Public License
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 # along with this program. If not, see <http://www.gnu.org/licenses/>.
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
202
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
24 import base64
290
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
25 import bz2
202
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
26 import copy
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
27 import pprint
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
28 import tempfile
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 import unittest
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30
11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
31 from PIL import ImageChops
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 from Toolbox import *
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
33 from xml.dom import minidom
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 _LOCAL = None
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 _REMOTE = None
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 def SetOrthancParameters(local, remote):
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 global _LOCAL, _REMOTE
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 _LOCAL = local
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 _REMOTE = remote
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
45 def ExtractDicomTags(rawDicom, tags):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
46 with tempfile.NamedTemporaryFile(delete = True) as f:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
47 f.write(rawDicom)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
48 f.flush()
45
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 44
diff changeset
49 data = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ])
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
50
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
51 result = []
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
52 for tag in tags:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
53 match = re.search('<element[^>]+name="%s">([^>]*)</element>' % tag, data)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
54 if match == None:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
55 result.append('')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
56 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
57 result.append(match.group(1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
58
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
59 return result
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
60
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
61
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
62 def CompareLists(a, b):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
63 if len(a) != len(b):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
64 return False
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
65
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
66 for i in range(len(a)):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
67 d = a[i] - b[i]
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
68 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
69 return False
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
70
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
71 return True
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
72
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
73
80
8466dbfcb22b fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
74 def CompareTags(a, b, tagsToIgnore):
8466dbfcb22b fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
75 for i in tagsToIgnore:
8466dbfcb22b fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
76 if i in a:
8466dbfcb22b fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
77 del a[i]
8466dbfcb22b fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
78 if i in b:
8466dbfcb22b fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
79 del b[i]
8466dbfcb22b fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
80
123
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
81 if a.keys() == b.keys():
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
82 return True
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
83 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
84 print('Mismatch in tags: %s' % str(set(a.keys()) ^ set(b.keys())))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
85 return False
80
8466dbfcb22b fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
86
8466dbfcb22b fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
87
71
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
88 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
89 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
90 '-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
91 _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
92 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
93 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
94
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
95
142
6d2bfbbd0c2d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 141
diff changeset
96 def GetMoveScuCommand():
6d2bfbbd0c2d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 141
diff changeset
97 return [
6d2bfbbd0c2d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 141
diff changeset
98 FindExecutable('movescu'),
6d2bfbbd0c2d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 141
diff changeset
99 '--move', _LOCAL['DicomAet'], # Target AET (i.e. storescp)
6d2bfbbd0c2d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 141
diff changeset
100 '--call', _REMOTE['DicomAet'], # Called AET (i.e. Orthanc)
6d2bfbbd0c2d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 141
diff changeset
101 '--aetitle', _LOCAL['DicomAet'], # Calling AET (i.e. storescp)
6d2bfbbd0c2d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 141
diff changeset
102 _REMOTE['Server'],
6d2bfbbd0c2d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 141
diff changeset
103 str(_REMOTE['DicomPort'])
6d2bfbbd0c2d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 141
diff changeset
104 ]
6d2bfbbd0c2d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 141
diff changeset
105
231
4087505ddfe3 catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 220
diff changeset
106
54
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
107 def CallMoveScu(args):
231
4087505ddfe3 catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 220
diff changeset
108 try:
4087505ddfe3 catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 220
diff changeset
109 subprocess.check_call(GetMoveScuCommand() + args,
4087505ddfe3 catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 220
diff changeset
110 stderr=subprocess.PIPE)
4087505ddfe3 catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 220
diff changeset
111 except subprocess.CalledProcessError as e:
4087505ddfe3 catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 220
diff changeset
112 # 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
113 # 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
114 # 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
115 # DICOM instances.
4087505ddfe3 catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 220
diff changeset
116 # 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
117 if e.returncode != 69:
4087505ddfe3 catching error codes of movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 220
diff changeset
118 raise e
54
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
119
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
120
51
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
121 def GenerateTestSequence():
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
122 return [
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
123 {
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
124 'StudyDescription': 'Hello^',
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
125 'ReferencedStudySequence' : [
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
126 {
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
127 'StudyDescription': 'Toto',
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
128 },
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
129 {
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
130 'StudyDescription': 'Tata',
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
131 },
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
132 ]
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
133 },
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
134 {
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
135 'StudyDescription': 'Sébastien^',
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
136 'StudyDate' : '19700202',
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
137 }
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
138 ]
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
139
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
140
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 class Orthanc(unittest.TestCase):
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 def setUp(self):
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 81
diff changeset
143 if (sys.version_info >= (3, 0)):
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 81
diff changeset
144 # Remove annoying warnings about unclosed socket in Python 3
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 81
diff changeset
145 import warnings
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 81
diff changeset
146 warnings.simplefilter("ignore", ResourceWarning)
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 81
diff changeset
147
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 DropOrthanc(_LOCAL)
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 DropOrthanc(_REMOTE)
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
150 UninstallLuaCallbacks(_REMOTE)
45
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 44
diff changeset
151 #print "In test", self._testMethodName
44
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 43
diff changeset
152
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
153 def AssertSameImages(self, truth, url):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
154 im = GetImage(_REMOTE, url)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
155 self.assertTrue(CompareLists(truth, im.getdata()))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
156
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 def test_system(self):
177
ef6b791c6d62 fix version checks
am@osimis.io
parents: 176
diff changeset
159 self.assertTrue('Version' in DoGet(_REMOTE, '/system'))
ef6b791c6d62 fix version checks
am@osimis.io
parents: 176
diff changeset
160 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
ef6b791c6d62 fix version checks
am@osimis.io
parents: 176
diff changeset
161 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
ef6b791c6d62 fix version checks
am@osimis.io
parents: 176
diff changeset
162
ef6b791c6d62 fix version checks
am@osimis.io
parents: 176
diff changeset
163 systemInfo = DoGet(_REMOTE, '/system')
ef6b791c6d62 fix version checks
am@osimis.io
parents: 176
diff changeset
164 if systemInfo["Version"] == "mainline":
ef6b791c6d62 fix version checks
am@osimis.io
parents: 176
diff changeset
165 print "Skipping version checks since you're currently in mainline"
ef6b791c6d62 fix version checks
am@osimis.io
parents: 176
diff changeset
166 return
ef6b791c6d62 fix version checks
am@osimis.io
parents: 176
diff changeset
167
173
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
168 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 8, 6))
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
169 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 8, 7))
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
170 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 7, 6))
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
171 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 9, 6))
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
172 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 1, 8, 6))
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 def test_upload(self):
173
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
175 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
176 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
177
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
178 sizeDummyCT = 2472
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
179 sizeOverwrite = 2476
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
180 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d'
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
181
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
183
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
183 self.assertEqual(instance, u['ID'])
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 self.assertEqual('Success', u['Status'])
173
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
185
183
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
186 if True:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
187 # New test for Orthanc 1.4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
188 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', u['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
189 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', u['ParentStudy'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
190 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', u['ParentPatient'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
191
173
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
192 j = int(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % instance))
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
193 s = sizeDummyCT + j
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
194 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
195 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
196
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
173
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
202 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
203 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
204
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
205 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance)
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206 self.assertEqual('20070101', i['StudyDate'])
173
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
207 self.assertEqual('KNIX', i['PatientName'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
208
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
209 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2):
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
210 # Overwriting
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
211 self.assertEqual('Success', u['Status'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
212 else:
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
213 self.assertEqual('AlreadyStored', u['Status'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
214
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
215 u = UploadInstance(_REMOTE, 'DummyCT-overwrite.dcm')
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
216 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
217 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
218 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
219 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
220
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
221 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2):
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
222 # Overwriting
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
223 self.assertEqual('Success', u['Status'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
224 j2 = int(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % instance))
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
225 s2 = sizeOverwrite + j2
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
226 self.assertNotEqual(s, s2)
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
227 self.assertNotEqual(j, j2)
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
228 self.assertEqual('%d' % s2, DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
229 self.assertEqual('%d' % s2, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
230 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance)
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
231 self.assertEqual('ANOTHER', i['PatientName'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
232 else:
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
233 self.assertEqual('AlreadyStored', u['Status'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
234 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 154
diff changeset
235 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
236
5
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
237 def test_upload_2(self):
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
238 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
239 instance = DoGet(_REMOTE, '/instances/%s' % i)
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
240 self.assertEqual(i, instance['ID'])
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
241 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109',
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
242 instance['MainDicomTags']['SOPInstanceUID'])
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
243
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
244 series = DoGet(_REMOTE, '/series/%s' % instance['ParentSeries'])
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
245 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394',
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
246 series['MainDicomTags']['SeriesInstanceUID'])
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
247
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
248 study = DoGet(_REMOTE, '/studies/%s' % series['ParentStudy'])
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
249 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390',
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
250 study['MainDicomTags']['StudyInstanceUID'])
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
251
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
252 patient = DoGet(_REMOTE, '/patients/%s' % study['ParentPatient'])
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
253 self.assertEqual('ozp00SjY2xG',
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
254 patient['MainDicomTags']['PatientID'])
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
255
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
256 dicom = DoGet(_REMOTE, '/instances/%s/file' % instance['ID'])
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
257 self.assertEqual(2472, len(dicom))
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
258 self.assertEqual('3e29b869978b6db4886355a2b1132124', ComputeMD5(dicom))
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
259 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i)))
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
260 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/simplified-tags' % i)['StationName'])
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261 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
262 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
263 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/tags?short' % i)['0008,1010'])
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
264
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
265
5
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
266 def test_images(self):
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
267 i = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID']
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
268 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i)))
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
269
5
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
270 im = GetImage(_REMOTE, '/instances/%s/preview' % i)
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
271 self.assertEqual("L", im.mode)
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
272 self.assertEqual(512, im.size[0])
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
273 self.assertEqual(358, im.size[1])
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
274
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
275 im = GetImage(_REMOTE, '/instances/%s/image-uint8' % i)
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
276 self.assertEqual("L", im.mode)
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
277 self.assertEqual(512, im.size[0])
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
278 self.assertEqual(358, im.size[1])
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
279
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
280 im = GetImage(_REMOTE, '/instances/%s/image-uint16' % i)
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
281 self.assertEqual(512, im.size[0])
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
282 self.assertEqual(358, im.size[1])
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
283
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
284 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i)
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
285 self.assertEqual("L", im.mode)
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
286 self.assertEqual(512, im.size[0])
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
287 self.assertEqual(358, im.size[1])
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
288
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
289 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint8' % i)
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
290 self.assertEqual("L", im.mode)
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
291 self.assertEqual(512, im.size[0])
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
292 self.assertEqual(358, im.size[1])
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
293
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
294 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint16' % i)
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
295 self.assertEqual(512, im.size[0])
19eb87a45685 test_images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
296 self.assertEqual(358, im.size[1])
64
369e439cdfd6 test access header
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 63
diff changeset
297
369e439cdfd6 test access header
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 63
diff changeset
298 # This is Little Endian Explicit
369e439cdfd6 test access header
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 63
diff changeset
299 self.assertEqual('1.2.840.10008.1.2.1', DoGet(_REMOTE, '/instances/%s/header?simplify' % i)['TransferSyntaxUID'])
369e439cdfd6 test access header
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 63
diff changeset
300
6
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
301
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
302 def test_hierarchy(self):
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
303 UploadFolder(_REMOTE, 'Brainix/Epi')
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
304 UploadFolder(_REMOTE, 'Brainix/Flair')
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
305 UploadFolder(_REMOTE, 'Knee/T1')
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
306 UploadFolder(_REMOTE, 'Knee/T2')
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
307
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
308 p = DoGet(_REMOTE, '/patients')
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
309 s = DoGet(_REMOTE, '/studies')
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
310 t = DoGet(_REMOTE, '/series')
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
311 self.assertEqual(2, len(p))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
312 self.assertEqual(2, len(s))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
313 self.assertEqual(4, len(t))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
314 self.assertEqual(94, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
315
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
316 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0'
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
317 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988'
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
318 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8'
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
319 brainixFlair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0'
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
320
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
321 kneePatient = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17'
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
322 kneeStudy = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
323 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
324 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
325
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
326 self.assertTrue(brainixPatient in p)
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
327 self.assertTrue(kneePatient in p)
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
328 self.assertTrue(brainixStudy in s)
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
329 self.assertTrue(kneeStudy in s)
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
330 self.assertTrue(brainixEpi in t)
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
331 self.assertTrue(brainixFlair in t)
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
332 self.assertTrue(kneeT1 in t)
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
333 self.assertTrue(kneeT2 in t)
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
334
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
335 self.assertEqual(44, len(DoGet(_REMOTE, '/patients/%s/instances' % brainixPatient)))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
336 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % brainixPatient)))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
337 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % brainixPatient)))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
338
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
339 self.assertEqual(50, len(DoGet(_REMOTE, '/patients/%s/instances' % kneePatient)))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
340 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % kneePatient)))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
341 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % kneePatient)))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
342
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
343 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % brainixStudy)))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
344 self.assertEqual(44, len(DoGet(_REMOTE, '/studies/%s/instances' % brainixStudy)))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
345
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
346 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % kneeStudy)))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
347 self.assertEqual(50, len(DoGet(_REMOTE, '/studies/%s/instances' % kneeStudy)))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
348
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
349 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixEpi)))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
350 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixFlair)))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
351 self.assertEqual(24, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT1)))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
352 self.assertEqual(26, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT2)))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
353
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
354 for patient in p:
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
355 for study in DoGet(_REMOTE, '/patients/%s/studies' % patient):
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
356 self.assertEqual(patient, study['ParentPatient'])
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
357 for series in DoGet(_REMOTE, '/studies/%s/series' % study['ID']):
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
358 self.assertEqual(study['ID'], series['ParentStudy'])
211
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
359 self.assertEqual('Unknown', series['Status'])
6
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
360 for instance in DoGet(_REMOTE, '/series/%s/instances' % series['ID']):
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
361 self.assertEqual(series['ID'], instance['ParentSeries'])
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
362
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
363 self.assertEqual(json.dumps(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/data' % instance['ID'])),
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
364 json.dumps(DoGet(_REMOTE, '/instances/%s/tags' % instance['ID'])))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
365
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
366
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
367 r = DoDelete(_REMOTE, "/studies/%s" % brainixStudy)['RemainingAncestor']
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
368 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
369 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
370 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
371 self.assertEqual(50, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
372 self.assertEqual(None, r)
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
373
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
374 r = DoDelete(_REMOTE, "/series/%s" % kneeT2)['RemainingAncestor']
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
375 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
376 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
377 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
378 self.assertEqual(24, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
379 self.assertEqual('Study', r['Type'])
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
380 self.assertEqual(kneeStudy, r['ID'])
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
381
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
382 r = DoDelete(_REMOTE, "/instances/%s" % DoGet(_REMOTE, '/instances')[0])['RemainingAncestor']
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
383 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
384 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
385 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
386 self.assertEqual(23, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
387 self.assertEqual('Series', r['Type'])
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
388 self.assertEqual(kneeT1, r['ID'])
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
389
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
390 r = DoDelete(_REMOTE, "/patients/%s" % kneePatient)['RemainingAncestor']
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
391 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
392 self.assertEqual(0, len(DoGet(_REMOTE, '/studies')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
393 self.assertEqual(0, len(DoGet(_REMOTE, '/series')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
394 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
395 self.assertEqual(None, r)
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
396
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
397 DropOrthanc(_REMOTE)
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
398 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
399 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
7
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
400
213
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents: 211
diff changeset
401 def test_delete_cascade(self):
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents: 211
diff changeset
402 # 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
403
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents: 211
diff changeset
404 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
405 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
406 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
407 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
408 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
409 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
410
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents: 211
diff changeset
411 DoDelete(_REMOTE, '/instances/%s' % a)
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents: 211
diff changeset
412
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents: 211
diff changeset
413 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
414 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
415 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
416 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
417
7
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
418
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
419 def test_multiframe(self):
7
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
420 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
421 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % i)))
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
422
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
423 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i)
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
424 self.assertEqual("L", im.mode)
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
425 self.assertEqual(512, im.size[0])
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
426 self.assertEqual(512, im.size[1])
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
427
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
428 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint8' % i)
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
429 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint16' % i)
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
430 DoGet(_REMOTE, '/instances/%s/frames/75/preview' % i)
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
431 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/aaa/preview' % i))
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
432 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/76/preview' % i))
302f06f3bba2 test_multi_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
433
8
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
434
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
435 def test_changes(self):
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
436 # Check emptiness
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
437 c = DoGet(_REMOTE, '/changes')
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
438 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
439 #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
440 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
441 c = DoGet(_REMOTE, '/changes?last')
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
442 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
443 #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
444 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
445
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
446 # Add 1 instance
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
447 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
448 c = DoGet(_REMOTE, '/changes')
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
449 begin = c['Last']
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
450 self.assertEqual(4, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
451 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
452 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
453
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
454 c = DoGet(_REMOTE, '/changes?last')
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
455 self.assertEqual(1, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
456 self.assertEqual(begin, c['Last'])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
457 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
458 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
459 self.assertEqual(1, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
460 self.assertEqual(begin, c['Last'])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
461 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
462 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
463 self.assertEqual(1, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
464 self.assertEqual(begin - 1, c['Last'])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
465 self.assertFalse(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
466 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
467 self.assertEqual(1, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
468 self.assertEqual(begin - 2, c['Last'])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
469 self.assertFalse(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
470
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
471 UploadFolder(_REMOTE, 'Knee/T1')
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
472 UploadFolder(_REMOTE, 'Knee/T2')
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
473 since = begin
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
474 countPatients = 0
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
475 countStudies = 0
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
476 countSeries = 0
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
477 countInstances = 0
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
478 completed = 0
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
479 while True:
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
480 c = DoGet(_REMOTE, '/changes', { 'since' : since, 'limit' : 3 })
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
481 since = c['Last']
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
482 for i in c['Changes']:
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
483 if i['ResourceType'] == 'Instance':
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
484 countInstances += 1
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
485 if i['ResourceType'] == 'Patient':
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
486 countPatients += 1
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
487 if i['ResourceType'] == 'Study':
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
488 countStudies += 1
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
489 if i['ResourceType'] == 'Series':
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
490 countSeries += 1
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
491 if i['ChangeType'] == 'NewInstance':
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
492 countInstances += 1
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
493 if i['ChangeType'] == 'NewPatient':
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
494 countPatients += 1
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
495 if i['ChangeType'] == 'NewStudy':
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
496 countStudies += 1
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
497 if i['ChangeType'] == 'NewSeries':
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
498 countSeries += 1
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
499 if i['ChangeType'] == 'CompletedSeries':
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
500 completed += 1
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
501 self.assertTrue('ID' in i)
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
502 self.assertTrue('Path' in i)
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
503 self.assertTrue('Seq' in i)
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
504 if c['Done']:
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
505 break
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
506
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
507 self.assertEqual(2 * 50, countInstances)
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
508 self.assertEqual(2 * 1, countPatients)
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
509 self.assertEqual(2 * 1, countStudies)
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
510 self.assertEqual(2 * 2, countSeries)
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
511 self.assertEqual(0, completed)
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
512
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
513
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
514 def test_archive(self):
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
515 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
516 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
192
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
517 knee = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
518
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
519 z = GetArchive(_REMOTE, '/patients/%s/archive' % knee)
8
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
520 self.assertEqual(2, len(z.namelist()))
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
521
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
522 z = GetArchive(_REMOTE, '/studies/%s/archive' % DoGet(_REMOTE, '/studies')[0])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
523 self.assertEqual(2, len(z.namelist()))
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
524
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
525 z = GetArchive(_REMOTE, '/series/%s/archive' % DoGet(_REMOTE, '/series')[0])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
526 self.assertEqual(1, len(z.namelist()))
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
527
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
528 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
192
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
529 brainix = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
530
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
531 z = GetArchive(_REMOTE, '/patients/%s/archive' % knee)
8
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
532 self.assertEqual(2, len(z.namelist()))
192
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
533
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
534 z = PostArchive(_REMOTE, '/tools/create-archive', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
535 'Resources' : [ brainix, knee ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
536 })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
537 self.assertEqual(3, len(z.namelist()))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
538
8
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
539
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
540 def test_media_archive(self):
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
541 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
542 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
543
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
544 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
545 self.assertEqual(3, len(z.namelist()))
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
546 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
547 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
548 self.assertTrue('DICOMDIR' in z.namelist())
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
549
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
550 try:
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
551 os.remove('/tmp/DICOMDIR')
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
552 except:
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
553 # The file does not exist
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
554 pass
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
555
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
556 z.extract('DICOMDIR', '/tmp')
45
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 44
diff changeset
557 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
558 stderr = subprocess.STDOUT).split('\n')
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
559 self.assertEqual(3, len(a))
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
560 self.assertTrue(a[0].startswith('Warning'))
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
561 self.assertEqual('BasicDirectory', a[1])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
562 self.assertEqual('', a[2])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
563
45
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 44
diff changeset
564 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
565 stderr = subprocess.STDOUT).split('\n')
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
566 self.assertEqual(1, len(a))
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
567 self.assertEqual('', a[0])
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
568
45
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 44
diff changeset
569 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
570 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
571 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
572
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 7
diff changeset
573 os.remove('/tmp/DICOMDIR')
10
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
574
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
575
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
576 def test_protection(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
577 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
578 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
579 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
580 a = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
581 b = DoGet(_REMOTE, '/patients')[1]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
582 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
583 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
584 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
585 DoPut(_REMOTE, '/patients/%s/protected' % a, '1', 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
586 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
587 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
588 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
589
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
590
12
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
591 def test_raw_tags(self):
10
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
592 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
593
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
594 dicom = DoGet(_REMOTE, '/instances/%s/file' % i)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
595 self.assertEqual('1a7c56cb02d6e742cc9c856a8ac182e3', ComputeMD5(dicom))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
596
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
597 s = '/instances/%s/content/' % i
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
598
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
599 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, s + '0008-1010').strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
600 self.assertRaises(Exception, lambda: DoGet(_REMOTE, s + '0008-1011'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
601
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
602 self.assertEqual('Abdomen', DoGet(_REMOTE, s + '7fe1-1001/0/7fe1-1008/0/7fe1-1057').strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
603 self.assertEqual('cla_3c', DoGet(_REMOTE, s + '7fe1-1001/0/7fe1-1008/8/7fe1-1057').strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
604
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
605 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
606 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
607 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
608 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
609
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
610 for i in DoGet(_REMOTE, '/instances'):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
611 aid = DoGet(_REMOTE, '/instances/%s' % i)['MainDicomTags']['SOPInstanceUID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
612 self.assertEqual(aid, DoGet(_REMOTE, '/instances/%s/content/0008-0018' % i).replace(chr(0), ''))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
613
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
614
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
615 def test_raw_tags_mdn(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
616 # Bug reported by Cyril Paulus
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
617 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
618 self.assertAlmostEqual(0.000027, DoGet(_REMOTE, '/instances/%s/content/7053-1000' % i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
619
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
620
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
621 def test_modify_instance(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
622 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
623 modified = DoPost(_REMOTE, '/instances/%s/modify' % i,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
624 json.dumps({
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
625 "Replace" : {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
626 "PatientName" : "hello",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
627 #"PatientID" : "world"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
628 },
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
629 "Remove" : [ "StationName" ],
118
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
630 "RemovePrivateTags" : True
10
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
631 }),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
632 'application/json')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
633 j = DoPost(_REMOTE, '/instances', modified, 'application/dicom')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
634
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
635 self.assertNotEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
636 #self.assertNotEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % i).strip())
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 81
diff changeset
637 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i).strip())
10
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
638 DoGet(_REMOTE, '/instances/%s/content/6003-1010' % i) # Some private tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
639
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
640 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
641 #self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % j).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
642 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
643 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/6003-1010' % j))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
644
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
645
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
646 def test_modify_series(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
647 # Upload 4 images from the same series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
648 for i in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
649 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
650
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
651 origSeries = DoGet(_REMOTE, '/series')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
652 newSeries = DoPost(_REMOTE, '/series/%s/modify' % origSeries,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
653 '{"Replace":{"PatientName":"Jodogne"}}',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
654 'application/json')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
655
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
656 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['ModifiedFrom'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
657 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
658 self.assertEqual(4, len(instances))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
659 for i in instances:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
660 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
661 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
662 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
663
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
664 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
665 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
666
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
667
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
668 def test_modify_study(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
669 # Upload 4 images from the 2 series of the same study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
670 for i in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
671 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
672 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
673
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
674 origStudy = DoGet(_REMOTE, '/studies')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
675 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
676 '{"Replace":{"PatientName":"Jodogne"}}',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
677 'application/json')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
678
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
679 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['ModifiedFrom'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
680 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
681 self.assertEqual(2, len(series))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
682 for s in series:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
683 ss = DoGet(_REMOTE, '/series/%s' % s)['ModifiedFrom']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
684 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
685 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
686
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
687 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
688 for i in instances:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
689 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
690 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
691 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
692
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
693 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
694 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
695
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
696
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
697 def test_anonymize_series(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
698 # Upload 4 images from the same series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
699 for i in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
700 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
701
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
702 origSeries = DoGet(_REMOTE, '/series')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
703 newSeries = DoPost(_REMOTE, '/series/%s/anonymize' % origSeries,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
704 '{}',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
705 'application/json')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
706
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
707 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['AnonymizedFrom'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
708 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
709 self.assertEqual(4, len(instances))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
710 for i in instances:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
711 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
712 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
713 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
714
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
715 DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
716 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
717
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
718
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
719 def test_anonymize_study(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
720 # Upload 4 images from the 2 series of the same study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
721 for i in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
722 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
723 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
724
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
725 origStudy = DoGet(_REMOTE, '/studies')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
726 newStudy = DoPost(_REMOTE,'/studies/%s/anonymize' % origStudy,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
727 '{"Replace":{"PatientName":"Jodogne"}}',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
728 'application/json')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
729
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
730 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['AnonymizedFrom'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
731 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
732 self.assertEqual(2, len(series))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
733 for s in series:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
734 ss = DoGet(_REMOTE, '/series/%s' % s)['AnonymizedFrom']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
735 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
736 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
737
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
738 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
739 for i in instances:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
740 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
741 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
742 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
743
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
744 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
745 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
746
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
747
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
748
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
749 def test_storescu(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
750 # Check emptiness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
751 e = DoGet(_REMOTE, '/exports')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
752 self.assertEqual(0, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
753 self.assertEqual(0, e['Last'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
754 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
755 e = DoGet(_REMOTE, '/exports?last')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
756 self.assertEqual(0, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
757 self.assertEqual(0, e['Last'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
758 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
759
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
760 # Add 1 instance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
761 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
762 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
763
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
764 # Export the instance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
765 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') # instance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
766 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
767 self.assertEqual(1, len(DoGet(_LOCAL, '/studies')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
768 self.assertEqual(1, len(DoGet(_LOCAL, '/series')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
769 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
770
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
771 e = DoGet(_REMOTE, '/exports')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
772 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
773 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
774 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
775 e = DoGet(_REMOTE, '/exports?limit=1')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
776 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
777 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
778 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
779 e = DoGet(_REMOTE, '/exports?last')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
780 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
781 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
782 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
783 seqInstance = e['Last']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
784
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
785 # Export the series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
786 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
787
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
788 e = DoGet(_REMOTE, '/exports')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
789 self.assertEqual(2, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
790 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
791 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
792 seqSeries = e['Last']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
793 self.assertNotEqual(seqInstance, seqSeries)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
794 e = DoGet(_REMOTE, '/exports?limit=1&since=0')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
795 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
796 self.assertFalse(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
797 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
798 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
799 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
800 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
801 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
802 e = DoGet(_REMOTE, '/exports?last')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
803 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
804 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
805 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
806
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
807 # Export the study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
808 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
809 seqStudy = DoGet(_REMOTE, '/exports')['Last']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
810
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
811 # Export the patient
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
812 j = DoPost(_REMOTE, '/modalities/orthanctest/store', '6816cb19-844d5aee-85245eba-28e841e6-2414fae2', 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
813 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
814 self.assertEqual(1, len(DoGet(_LOCAL, '/studies')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
815 self.assertEqual(1, len(DoGet(_LOCAL, '/series')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
816 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
817
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
818 e = DoGet(_REMOTE, '/exports')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
819 self.assertEqual(4, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
820 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
821 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
822 seqPatient = e['Last']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
823 self.assertNotEqual(seqInstance, seqSeries)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
824 self.assertNotEqual(seqSeries, seqStudy)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
825 self.assertNotEqual(seqStudy, seqPatient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
826 self.assertTrue(seqInstance < seqSeries)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
827 self.assertTrue(seqSeries < seqStudy)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
828 self.assertTrue(seqStudy < seqPatient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
829 e = DoGet(_REMOTE, '/exports?limit=1&since=0')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
830 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
831 self.assertFalse(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
832 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
833 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
834 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
835 self.assertFalse(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
836 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
837 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqSeries))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
838 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
839 self.assertFalse(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
840 self.assertEqual(e['Exports'][-1]['Seq'], seqStudy)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
841 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqStudy))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
842 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
843 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
844 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
845 e = DoGet(_REMOTE, '/exports?last')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
846 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
847 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
848 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
849
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
850
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
851 # Check the content of the logged information
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
852 e = DoGet(_REMOTE, '/exports')['Exports']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
853
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
854 if 'PatientID' in e[0]:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
855 # Since Orthanc 0.8.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
856 patient = 'PatientID'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
857 study = 'StudyInstanceUID'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
858 series = 'SeriesInstanceUID'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
859 instance = 'SOPInstanceUID'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
860 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
861 # Up to Orthanc 0.8.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
862 patient = 'PatientId'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
863 study = 'StudyInstanceUid'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
864 series = 'SeriesInstanceUid'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
865 instance = 'SopInstanceUid'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
866
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
867 for k in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
868 self.assertTrue('Date' in e[k])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
869 self.assertTrue('Seq' in e[k])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
870 self.assertEqual('orthanctest', e[k]['RemoteModality'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
871
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
872 self.assertEqual(10, len(e[0]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
873 self.assertEqual('Instance', e[0]['ResourceType'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
874 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
875 self.assertEqual('/instances/66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['Path'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
876 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', e[0][instance])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
877 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', e[0][series])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
878 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[0][study])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
879 self.assertEqual('ozp00SjY2xG', e[0][patient])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
880
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
881 self.assertEqual(9, len(e[1]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
882 self.assertEqual('Series', e[1]['ResourceType'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
883 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
884 self.assertEqual('/series/f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['Path'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
885 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', e[1][series])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
886 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[1][study])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
887 self.assertEqual('ozp00SjY2xG', e[1][patient])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
888
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
889 self.assertEqual(8, len(e[2]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
890 self.assertEqual('Study', e[2]['ResourceType'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
891 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
892 self.assertEqual('/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['Path'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
893 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[2][study])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
894 self.assertEqual('ozp00SjY2xG', e[2][patient])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
895
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
896 self.assertEqual(7, len(e[3]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
897 self.assertEqual('Patient', e[3]['ResourceType'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
898 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
899 self.assertEqual('/patients/6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['Path'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
900 self.assertEqual('ozp00SjY2xG', e[3][patient])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
901
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
902 DropOrthanc(_REMOTE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
903 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
904
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
905
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
906 def test_store_peer(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
907 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
908 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
909
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
910 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
911 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
912 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
913
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
914 j = DoPost(_REMOTE, '/peers/peer/store', str(i), 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
915 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
916 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
917
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
918 self.assertEqual(1, len(DoGet(_REMOTE, '/exports')['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
919
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
920 DropOrthanc(_REMOTE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
921 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
922
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
923
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
924 def test_bulk_storescu(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
925 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
926
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
927 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
928 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
929
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
930 j = DoPost(_REMOTE, '/modalities/orthanctest/store', [ a['ID'], b['ID'] ], 'application/json')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
931 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
932
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
933 DropOrthanc(_LOCAL)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
934
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
935 # Send using patient's UUID
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
936 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
937 j = DoPost(_REMOTE, '/modalities/orthanctest/store',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
938 [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ], 'application/json')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
939 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
940
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
941
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
942 def test_color(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
943 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
944 im = GetImage(_REMOTE, '/instances/%s/preview' % i)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
945 self.assertEqual("RGB", im.mode)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
946 self.assertEqual(41, im.size[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
947 self.assertEqual(41, im.size[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
948
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
949 # http://effbot.org/zone/pil-comparing-images.htm
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
950 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png'))
11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
951 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
952
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
953
12
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
954 def test_faking_ruby_put(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
955 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
956 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
957 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
958 a = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
959 b = DoGet(_REMOTE, '/patients')[1]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
960 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
961 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
962 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
963 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '1')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
964 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
965 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
966 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
967
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
968
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
969 def test_faking_ruby_delete(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
970 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
971 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
972 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
973 a = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
974 b = DoGet(_REMOTE, '/patients')[1]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
975 DoGet(_REMOTE, '/patients/%s' % a, data = { '_method' : 'DELETE' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
976 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
977 DoGet(_REMOTE, '/patients/%s' % b, data = { '_method' : 'DELETE' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
978 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
979
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
980
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
981 def test_faking_google_put(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
982 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
983 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
984 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
985 a = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
986 b = DoGet(_REMOTE, '/patients')[1]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
987 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
988 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '0')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
989 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
990 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '1')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
991 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
992 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '0')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
993 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
994
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
995
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
996 def test_faking_google_delete(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
997 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
998 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
999 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1000 a = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1001 b = DoGet(_REMOTE, '/patients')[1]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1002 DoPost(_REMOTE, '/patients/%s' % a, headers = { 'X-HTTP-Method-Override' : 'DELETE' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1003 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1004 DoPost(_REMOTE, '/patients/%s' % b, headers = { 'X-HTTP-Method-Override' : 'DELETE' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1005 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1006
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1007
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1008 def test_lua(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1009 self.assertEqual(42, DoPost(_REMOTE, '/tools/execute-script', 'print(42)'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1010 self.assertTrue(IsDefinedInLua(_REMOTE, 'PrintRecursive'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1011 self.assertFalse(IsDefinedInLua(_REMOTE, 'HelloWorld'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1012
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1013
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1014 def test_metadata(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1015 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1016 p = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1017 i = DoGet(_REMOTE, '/instances')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1018
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1019 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1020 self.assertEqual(1, len(m))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1021 self.assertEqual('LastUpdate', m[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1022
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1023 m = DoGet(_REMOTE, '/instances/%s/metadata' % i)
145
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 144
diff changeset
1024 self.assertEqual(8, len(m))
12
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1025 self.assertTrue('IndexInSeries' in m)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1026 self.assertTrue('ReceptionDate' in m)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1027 self.assertTrue('RemoteAET' in m)
63
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1028 self.assertTrue('Origin' in m)
89
74b7b9aed5f8 test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
1029 self.assertTrue('TransferSyntax' in m)
95
a807a4699eb4 testing of metadata SopClassUid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 92
diff changeset
1030 self.assertTrue('SopClassUid' in m)
145
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 144
diff changeset
1031 self.assertTrue('RemoteIP' in m)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 144
diff changeset
1032 self.assertTrue('HttpUsername' in m)
63
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1033 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
1034 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
1035 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
1036 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
1037 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i), '1.2.840.10008.5.1.4.1.1.4')
12
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1038
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1039 # Play with custom metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1040 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'coucou')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1041 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1042 self.assertEqual(2, len(m))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1043 self.assertTrue('LastUpdate' in m)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1044 self.assertTrue('5555' in m)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1045 self.assertEqual('coucou', DoGet(_REMOTE, '/patients/%s/metadata/5555' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1046 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'hello')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1047 self.assertEqual('hello', DoGet(_REMOTE, '/patients/%s/metadata/5555' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1048 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1049 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1050 self.assertEqual(1, len(m))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1051 self.assertTrue('LastUpdate' in m)
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1052
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1053
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1054 def test_statistics(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1055 # Upload 16 instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1056 for i in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1057 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1058 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1059 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1060 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1061
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1062 s = DoGet(_REMOTE, '/statistics')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1063 self.assertEqual(16, s['CountInstances'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1064 self.assertEqual(2, s['CountPatients'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1065 self.assertEqual(2, s['CountStudies'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1066 self.assertEqual(4, s['CountSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1067 d = int(s['TotalUncompressedSize'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1068
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1069 e = 0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1070 for patient in DoGet(_REMOTE, '/patients'):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1071 s = DoGet(_REMOTE, '/patients/%s/statistics' % patient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1072 self.assertEqual(8, s['CountInstances'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1073 self.assertEqual(1, s['CountStudies'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1074 self.assertEqual(2, s['CountSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1075 e += int(s['UncompressedSize'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1076
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1077 for study in DoGet(_REMOTE, '/studies'):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1078 s = DoGet(_REMOTE, '/studies/%s/statistics' % study)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1079 self.assertEqual(8, s['CountInstances'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1080 self.assertEqual(2, s['CountSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1081 e += int(s['UncompressedSize'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1082
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1083 for series in DoGet(_REMOTE, '/series'):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1084 s = DoGet(_REMOTE, '/series/%s/statistics' % series)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1085 self.assertEqual(4, s['CountInstances'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1086 e += int(s['UncompressedSize'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1087
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1088 self.assertEqual(3 * d, e)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1089
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1090
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1091 def test_custom_attachment(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1092 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1093 patient = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1094 instance = DoGet(_REMOTE, '/instances')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1095 size = int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1096 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1097
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1098 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1099 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1100 self.assertTrue('dicom' in DoGet(_REMOTE, '/instances/%s/attachments' % instance))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1101 self.assertTrue('dicom-as-json' in DoGet(_REMOTE, '/instances/%s/attachments' % instance))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1102
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1103 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/patients/%s/attachments/22' % patient, 'hello'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1104 hello = 'hellohellohellohellohellohellohellohellohello'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1105 DoPut(_REMOTE, '/patients/%s/attachments/1025' % patient, hello)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1106 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1107 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1108 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1109 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1110
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1111 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1112 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1113 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1114 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1115 size +
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1116 int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient)) +
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1117 int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1118
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1119 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1120 self.assertEqual(hello, DoGet(_REMOTE, '/patients/%s/attachments/1025/data' % patient))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1121 self.assertEqual('world', DoGet(_REMOTE, '/patients/%s/attachments/1026/data' % patient))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1122 DoPost(_REMOTE, '/patients/%s/attachments/1025/verify-md5' % patient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1123 DoPost(_REMOTE, '/patients/%s/attachments/1026/verify-md5' % patient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1124 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world2')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1125 self.assertEqual('world2', DoGet(_REMOTE, '/patients/%s/attachments/1026/data' % patient))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1126
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1127 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/instances/%s/attachments/dicom' % instance))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1128 DoDelete(_REMOTE, '/patients/%s/attachments/1025' % patient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1129 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1130 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1131 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1132 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1133
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1134 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1135 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1136 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1137
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1138 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), size)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1139 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1142 def test_incoming_storescu(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1143 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
45
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 44
diff changeset
1144 subprocess.check_call([ FindExecutable('storescu'),
44
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 43
diff changeset
1145 _REMOTE['Server'], str(_REMOTE['DicomPort']),
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1146 GetDatabasePath('ColorTestImageJ.dcm') ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1147 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1148
63
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1149 i = DoGet(_REMOTE, '/instances')
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1150 self.assertEqual(1, len(i))
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1151 m = DoGet(_REMOTE, '/instances/%s/metadata' % i[0])
145
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 144
diff changeset
1152 self.assertEqual(8, len(m))
63
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1153 self.assertTrue('IndexInSeries' in m)
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1154 self.assertTrue('ReceptionDate' in m)
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1155 self.assertTrue('RemoteAET' in m)
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1156 self.assertTrue('Origin' in m)
89
74b7b9aed5f8 test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
1157 self.assertTrue('TransferSyntax' in m)
95
a807a4699eb4 testing of metadata SopClassUid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 92
diff changeset
1158 self.assertTrue('SopClassUid' in m)
145
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 144
diff changeset
1159 self.assertTrue('RemoteIP' in m)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 144
diff changeset
1160 self.assertTrue('CalledAET' in m)
63
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1161 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
1162 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
1163 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
1164 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
1165 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
1166
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1167
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1168 def test_incoming_findscu(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1169 UploadInstance(_REMOTE, 'Multiframe.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1170 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1171
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1172 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', '0010,0010' ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1173 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1174 self.assertEqual(2, len(patientNames))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1175 self.assertTrue('Test Patient BG ' in patientNames)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1176 self.assertTrue('Anonymized' in patientNames)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1177
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1178 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,0021' ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1179 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1180 self.assertEqual(2, len(series))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1181 self.assertTrue('20070208' in series)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1182 self.assertTrue('19980312' in series)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1183
56
1059b8de42de ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 55
diff changeset
1184 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,0021', '-k', 'ModalitiesInStudy=MR\\XA' ])
1059b8de42de ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 55
diff changeset
1185 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i)
1059b8de42de ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 55
diff changeset
1186 self.assertEqual(1, len(series))
1059b8de42de ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 55
diff changeset
1187 self.assertTrue('19980312' in series)
1059b8de42de ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 55
diff changeset
1188
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1189 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=Anonymized' ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1190 series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1191 self.assertEqual(1, len(series))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1192
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1193 # Test the "CaseSentitivePN" flag (false by default)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1194 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=anonymized' ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1195 series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1196 self.assertEqual(1, len(series))
66
821d9eb73c45 Test returning sequence values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
1197
70
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1198 # Test range search (buggy if Orthanc <= 0.9.6)
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1199 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-' ])
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1200 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i)
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1201 self.assertEqual(2, len(studies))
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1202 self.assertTrue('20070208' in studies)
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1203 self.assertTrue('19980312' in studies)
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1204 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-19980312' ])
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1205 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i)
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1206 self.assertEqual(1, len(studies))
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1207 self.assertTrue('19980312' in studies)
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1208 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=-19980312' ])
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1209 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i)
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1210 self.assertEqual(1, len(studies))
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1211 self.assertTrue('19980312' in studies)
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1212
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1213
191
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1214 def test_incoming_findscu_2(self):
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1215 # This test fails if "LookupMode_DatabaseOnly" is used
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1216 # (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
1217 # DICOM tags are returned)
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1218 UploadInstance(_REMOTE, 'Multiframe.dcm')
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1219 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1220
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1221 # 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
1222 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
1223 sequences = re.findall('\(0008,2112\)', i)
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1224 self.assertEqual(1, len(sequences))
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1225
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1226 # Test returning a non-main DICOM tag,
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1227 # "SecondaryCaptureDeviceID" (0018,1010), whose value is
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1228 # "MEDPC" in "ColorTestImageJ.dcm"
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1229 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0018,1010' ])
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1230 tags = re.findall('\(0018,1010\).*MEDPC', i)
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1231 self.assertEqual(1, len(tags))
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1232
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1233
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1234 def test_incoming_findscu_3(self):
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1235 # This test fails if "LookupMode_DatabaseOnly" or
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1236 # "LookupMode_DiskOnAnswer" is used, as
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1237 # "SecondaryCaptureDeviceID" (0018,1010) is not a main DICOM
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1238 # 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
1239 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1240
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1241 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
1242 sequences = re.findall('\(0018,1010\)', i)
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1243 self.assertEqual(1, len(sequences))
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1244
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1245
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1246 def test_incoming_movescu(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1247 UploadInstance(_REMOTE, 'Multiframe.dcm')
137
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
1248
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
1249 # No matching patient, so no job is created
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
1250 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
1251 CallMoveScu([ '--patient', '-k', '0008,0052=PATIENT', '-k', 'PatientID=none' ])
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1252 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
137
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
1253
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
1254 # 1 Matching patient, track the job
138
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
1255 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
1256 '--patient',
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
1257 '-k', '0008,0052=PATIENT',
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
1258 '-k', 'PatientID=12345678'
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
1259 ])))
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1260 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1261
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1262
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1263 def test_findscu(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1264 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1265 j = UploadInstance(_REMOTE, 'Issue22.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1266 k = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1267 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1268
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1269 # Test the "find-patient" level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1270 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1271 self.assertEqual(1, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1272 self.assertEqual('ozp00SjY2xG', p[0]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1273
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1274 # Test wildcards constraints. The "LO" value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1275 # for PatientID is always case-sensitive, but the "PN" for
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1276 # PatientName might depend on the implementation:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1277 # "GenerateConfigurationForTests.py" will force it to be case
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1278 # insensitive (which was the default until Orthanc 0.8.6).
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1279 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'K*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1280 self.assertEqual(1, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1281
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1282 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'k*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1283 self.assertEqual(1, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1284
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1285 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'ozp*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1286 self.assertEqual(1, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1287
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1288 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'o?p*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1289 self.assertEqual(1, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1290
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1291 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : '0?q*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1292 self.assertEqual(0, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1293
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1294 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'B*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1295 self.assertEqual(0, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1296
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1297 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'b*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1298 self.assertEqual(0, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1299
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1300 DoPost(_REMOTE, '/modalities/orthanctest/store', str(j), 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1301 DoPost(_REMOTE, '/modalities/orthanctest/store', str(k), 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1302 DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1303 self.assertEqual(3, len(DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { })))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1304
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1305 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'A*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1306 self.assertEqual(2, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1307
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1308 # Test the "find-study" level. This is the instance "ColorTestImageJ.dcm"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1309 s = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1310 self.assertEqual(1, len(s))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1311 self.assertEqual('20070208', s[0]['StudyDate'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1312
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1313 # Test range searches
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1314 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1315 'StudyDate' : '-20070101' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1316 self.assertEqual(0, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1317
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1318 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1319 'StudyDate' : '20090101-' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1320 self.assertEqual(0, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1321
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1322 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1323 'StudyDate' : '20070101-' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1324 self.assertEqual(1, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1325
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1326 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1327 'StudyDate' : '-20090101' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1328 self.assertEqual(1, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1329
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1330 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1331 'StudyDate' : '20070207-20070207' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1332 self.assertEqual(0, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1333
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1334 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1335 'StudyDate' : '20070208-20070208' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1336 self.assertEqual(1, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1337
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1338 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1339 'StudyDate' : '20070209-20070209' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1340 self.assertEqual(0, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1341
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1342 # Test the ModalitiesInStudy tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1343 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1344 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1345 'ModalitiesInStudy' : 'US' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1346 self.assertEqual(0, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1347
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1348 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1349 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1350 'ModalitiesInStudy' : 'CT' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1351 self.assertEqual(1, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1352
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1353 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1354 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1355 'ModalitiesInStudy' : 'US\\CT' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1356 self.assertEqual(1, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1357
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1358 # Test the "find-series" level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1359 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1360 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1361 'StudyInstanceUID' : s[0]['StudyInstanceUID'] })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1362 self.assertEqual(1, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1363
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1364 # Test "\" separator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1365 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1366 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1367 'StudyInstanceUID' : s[0]['StudyInstanceUID'],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1368 'Modality' : 'MR\\CT\\US' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1369 self.assertEqual(1, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1370
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1371 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1372 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1373 'StudyInstanceUID' : s[0]['StudyInstanceUID'],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1374 'Modality' : 'MR\\US' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1375 self.assertEqual(0, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1376
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1377
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1378 def test_update_modalities(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1379 try:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1380 DoDelete(_REMOTE, '/modalities/toto')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1381 except:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1382 pass
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1383 try:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1384 DoDelete(_REMOTE, '/modalities/tata')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1385 except:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1386 pass
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1387 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1388 DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000 ])
116
4a196ebc7a4f updated tests for issue #31
amazy
parents: 112
diff changeset
1389 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'MedInria' ]) # check backward compatiblity with obsolete manufacturer
4a196ebc7a4f updated tests for issue #31
amazy
parents: 112
diff changeset
1390 DoDelete(_REMOTE, '/modalities/tata')
124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 123
diff changeset
1391 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoUniversalWildcard' ])
121
1a19f953f53c also test GenericNoWildcardInDates
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 120
diff changeset
1392 DoDelete(_REMOTE, '/modalities/tata')
1a19f953f53c also test GenericNoWildcardInDates
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 120
diff changeset
1393 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoWildcardInDates' ])
128
a9fdfcb696e6 added tests for ?expand in /peers and /modalities
amazy
parents: 127
diff changeset
1394 modalitiesReadback = DoGet(_REMOTE, '/modalities?expand')
182
7a6b532853ab modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
1395 self.assertEqual('STORESCP', modalitiesReadback['tata']['AET'])
7a6b532853ab modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
1396 self.assertEqual('localhost', modalitiesReadback['tata']['Host'])
7a6b532853ab modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
1397 self.assertEqual(2000, modalitiesReadback['tata']['Port'])
7a6b532853ab modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
1398 self.assertEqual('GenericNoWildcardInDates', modalitiesReadback['tata']['Manufacturer'])
116
4a196ebc7a4f updated tests for issue #31
amazy
parents: 112
diff changeset
1399 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000, 'InvalidManufacturerName' ]))
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1400 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/toto'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1401 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/tata'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1402 DoDelete(_REMOTE, '/modalities/toto')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1403 DoDelete(_REMOTE, '/modalities/tata')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1404 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1405 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/tata'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1406
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1407
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1408 def test_update_peers(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1409 # curl -X PUT http://localhost:8042/peers/toto -d '["http://localhost:8042/"]' -v
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1410 try:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1411 DoDelete(_REMOTE, '/peers/toto')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1412 except:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1413 pass
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1414 try:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1415 DoDelete(_REMOTE, '/peers/tata')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1416 except:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1417 pass
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1418 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1419 DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/' ])
214
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1420 DoPut(_REMOTE, '/peers/tata', { 'Url': 'http://localhost:8042/',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1421 'Username': 'user',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1422 'Password' : 'pass',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1423 'RemoteSelf' : 'self' })
128
a9fdfcb696e6 added tests for ?expand in /peers and /modalities
amazy
parents: 127
diff changeset
1424 self.assertTrue('tata' in DoGet(_REMOTE, '/peers'))
a9fdfcb696e6 added tests for ?expand in /peers and /modalities
amazy
parents: 127
diff changeset
1425 peersReadback = DoGet(_REMOTE, '/peers?expand')
a9fdfcb696e6 added tests for ?expand in /peers and /modalities
amazy
parents: 127
diff changeset
1426 self.assertEqual('http://localhost:8042/', peersReadback['tata']['Url'])
a9fdfcb696e6 added tests for ?expand in /peers and /modalities
amazy
parents: 127
diff changeset
1427 self.assertEqual('user', peersReadback['tata']['Username'])
214
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1428
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1429 if IsOrthancVersionAbove(_REMOTE, 1, 5, 4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1430 self.assertEqual(None, peersReadback['tata']['Password']) # make sure no sensitive data is included
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1431 self.assertFalse(peersReadback['tata']['Pkcs11']) # make sure no sensitive data is included
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1432 self.assertEqual('self', peersReadback['tata']['RemoteSelf'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1433 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1434 self.assertFalse('Password' in peersReadback['tata']) # make sure no sensitive data is included
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1435 self.assertFalse('Pkcs11' in peersReadback['tata']) # make sure no sensitive data is included
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1436 self.assertFalse('RemoteSelf' in peersReadback['tata'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1437
128
a9fdfcb696e6 added tests for ?expand in /peers and /modalities
amazy
parents: 127
diff changeset
1438 self.assertFalse('CertificateFile' in peersReadback['tata']) # make sure no sensitive data is included
a9fdfcb696e6 added tests for ?expand in /peers and /modalities
amazy
parents: 127
diff changeset
1439 self.assertFalse('CertificateKeyFile' in peersReadback['tata']) # make sure no sensitive data is included
a9fdfcb696e6 added tests for ?expand in /peers and /modalities
amazy
parents: 127
diff changeset
1440 self.assertFalse('CertificateKeyPassword' in peersReadback['tata']) # make sure no sensitive data is included
214
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1441
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1442 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a' ]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1443 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a', 'b', 'c' ]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1444 self.assertTrue('store' in DoGet(_REMOTE, '/peers/toto'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1445 self.assertTrue('store' in DoGet(_REMOTE, '/peers/tata'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1446 DoDelete(_REMOTE, '/peers/toto')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1447 DoDelete(_REMOTE, '/peers/tata')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1448 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1449 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/tata'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1450
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1451
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1452 def test_mesterhazy_modification(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1453 # When I modify a series ( eg. curl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1454 # http://localhost:8042/series/uidhere/modify -X POST -d
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1455 # '{"Replace":{"SeriesDate":"19990101"}}' ) the modified
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1456 # series is added to a new Study, instead of the existing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1457 # Study. Fixed in Orthanc 0.7.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1458
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1459 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1460 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1461 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1462
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1463 modified = DoPost(_REMOTE, '/series/%s/modify' % series,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1464 json.dumps({ "Replace" : { "SeriesDate" : "19990101" }}))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1465
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1466 self.assertEqual(study, DoGet(_REMOTE, '/series/%s' % modified['ID']) ['ParentStudy'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1467
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1468
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1469 def test_create(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1470 i = DoPost(_REMOTE, '/tools/create-dicom',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1471 json.dumps({
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1472 'PatientName' : 'Jodogne',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1473 'Modality' : 'CT',
58
b5518378e23b fix test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
1474 'SOPClassUID' : '1.2.840.10008.5.1.4.1.1.1',
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1475 'PixelData' : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==' # red dot in RGBA
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1476 }))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1477
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1478 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1479 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1480
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1481 png = GetImage(_REMOTE, '/instances/%s/preview' % i['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1482 self.assertEqual((5, 5), png.size)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1483
38
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
1484 j = DoGet(_REMOTE, i['Path'])
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
1485 self.assertEqual('Instance', j['Type'])
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
1486 self.assertEqual(j['ID'], i['ID'])
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
1487
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1488
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1489 def test_pilates(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1490 # "SCU failed error when accessing orthanc with osirix" by
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1491 # Pilates Agentur (Mar 10, 2014 at 9:33 PM)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1492 i = UploadInstance(_REMOTE, 'PilatesArgenturGEUltrasoundOsiriX.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1493 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1494 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1495 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1496
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1497
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1498 def test_shared_tags(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1499 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1500 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1501 p = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1502
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1503 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1504 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
1505 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
1506
5634ef96fcc5 testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 133
diff changeset
1507 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
1508 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
1509 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
1510
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1511 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1512 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1513 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1514 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1515 self.assertFalse('0008,0018' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1516 self.assertFalse('SOPInstanceUID' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1517
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1518 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/tags' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1519 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/tags?simplify' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1520
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1521
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1522 def test_modules(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1523 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1524 p = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1525 s = DoGet(_REMOTE, '/studies')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1526 t = DoGet(_REMOTE, '/series')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1527
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1528 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/module' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1529 self.assertTrue('PatientName' in DoGet(_REMOTE, '/patients/%s/module?simplify' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1530 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/studies/%s/module-patient' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1531 self.assertTrue('PatientName' in DoGet(_REMOTE, '/studies/%s/module-patient?simplify' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1532 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/studies/%s/module' % s))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1533 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/studies/%s/module?simplify' % s))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1534 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/series/%s/module' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1535 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/series/%s/module?simplify' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1536 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/module' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1537 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/module?simplify' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1538
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1539
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1540 def test_auto_directory(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1541 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1542 self.assertTrue('now' in DoGet(_REMOTE, '/tools'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1543 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
1544 self.assertTrue('invalidate-tags' in DoGet(_REMOTE, '/tools'))
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1545 self.assertTrue(len(DoGet(_REMOTE, '/tools/dicom-conformance')) > 1000)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1546 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1547 self.assertTrue('echo' in DoGet(_REMOTE, '/modalities/orthanctest'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1548 self.assertTrue('find' in DoGet(_REMOTE, '/modalities/orthanctest'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1549 self.assertTrue('find-instance' in DoGet(_REMOTE, '/modalities/orthanctest'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1550 self.assertTrue('find-patient' in DoGet(_REMOTE, '/modalities/orthanctest'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1551 self.assertTrue('find-series' in DoGet(_REMOTE, '/modalities/orthanctest'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1552 self.assertTrue('find-study' in DoGet(_REMOTE, '/modalities/orthanctest'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1553 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/orthanctest'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1554 self.assertTrue('store' in DoGet(_REMOTE, '/peers/peer'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1555 self.assertTrue('matlab' in DoGet(_REMOTE, '/instances/%s/frames/0' % a))
79
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
1556 self.assertTrue('raw' in DoGet(_REMOTE, '/instances/%s/frames/0' % a))
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1557 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/tools/nope'))
28
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 27
diff changeset
1558 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope'))
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 27
diff changeset
1559 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope/nope.html'))
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 27
diff changeset
1560 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope')[0].status)
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 27
diff changeset
1561 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope/nope.html')[0].status)
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1563
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1564 def test_echo(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1565 DoPost(_REMOTE, '/modalities/orthanctest/echo')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1566
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1567
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1568 def test_xml(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1569 json = DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/json' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1570 xml = minidom.parseString(DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/xml' }))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1571 items = xml.getElementsByTagName('root')[0].getElementsByTagName('item')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1572 self.assertEqual(len(items), len(json))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1573
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1574 self.assertTrue('dicom-conformance' in json)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1575
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1576 ok = False
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1577 for i in items:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1578 if i.childNodes[0].data == 'dicom-conformance':
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1579 ok = True
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1580 self.assertTrue(ok)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1581
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1582
46
85b2e36ed392 explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 45
diff changeset
1583 def test_googlecode_issue_16(self):
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1584 i = UploadInstance(_REMOTE, 'Issue16.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1585 t = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)['FrameIncrementPointer']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1586 self.assertEqual('0018,1063', t)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1587
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1588
46
85b2e36ed392 explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 45
diff changeset
1589 def test_googlecode_issue_22(self):
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1590 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1591 a = [
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1592 "f804691f62197040438f4627c6b994f1", # Frame 0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1593 "c69eee9a51eea3e8611e82e578897254",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1594 "315666be83e2d0111c77bc0996d84901",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1595 "3e27aa959d911172c48a1436443c72b1",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1596 "958642c9e7e9d232d3869faff546058c",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1597 "5e7ea8e3e4230cae707d143481355c59",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1598 "eda37f83558d858a596175aed8b2ad47",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1599 "486713bd2895c4ecbe0e97715ac7f80a",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1600 "091ef729eb169e67da8a0faa9631f9a8",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1601 "5aa2b8c7ffe0a483efaa8e12417686ca",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1602 "e2f39e85896fe58876654b94cd0b5013",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1603 "6fd2129e4950abbe1be053bc814d5da8",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1604 "c3331a8ba7a757f3d423735ab7fa81f9",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1605 "746f808582156734dd6b6fdfd3a0b72c",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1606 "8075ea2b227a70c60ea6b7b75a6bb190",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1607 "806b8b3e300c615099c11a5ec23465aa",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1608 "7c836aa298ba6eef96434579af631a11",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1609 "a0357dc9f4f72d73a885c33d7c287446",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1610 "f25ba3be1cc7d7fad95706adc199ea7d",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1611 "8b114c526b8cbed6cad8a3248b7b480c",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1612 "44e6670f127e612a2b4aa60a0d207698",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1613 "b8945f90fe02facf2ace24ca1ecbe0a5",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1614 "95c796c2fa8f59018b15cf2987b1f79b",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1615 "ce0a51ab30224205b44920221dc27351", # Frame 23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1616 ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1617
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1618 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1619 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/preview' % s))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1620
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1621 for i in range(len(a)):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1622 self.assertEqual(a[i], ComputeMD5(DoGet(_REMOTE, '/instances/%s/frames/%d/preview' % (s, i))))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1623
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1624
46
85b2e36ed392 explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 45
diff changeset
1625 def test_googlecode_issue_19(self):
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
1626 # This is an image with "YBR_FULL" photometric interpretation, it is not supported by Orthanc
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1627 # gdcmconv -i /home/jodogne/DICOM/GdcmDatabase/US_DataSet/HDI5000_US/3EAF5E01 -w -o Issue19.dcm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1628
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1629 a = UploadInstance(_REMOTE, 'Issue19.dcm')['ID']
304
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 302
diff changeset
1630 if not HasGdcmPlugin(_REMOTE):
299
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
1631 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/941ad3c8-05d05b88-560459f9-0eae0e20-6cddd533/preview'))
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1632
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1633
46
85b2e36ed392 explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 45
diff changeset
1634 def test_googlecode_issue_37(self):
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1635 # Same test for issues 35 and 37. Fixed in Orthanc 0.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1636 u = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1637
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1638 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1639 'CaseSensitive' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1640 'Query' : { 'StationName' : 'SMR4-MP3' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1641 self.assertEqual(1, len(a))
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1642
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1643
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1644 def test_rest_find(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1645 # Upload 8 instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1646 for i in range(2):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1647 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1648 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1649 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1650 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1651
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1652 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1653 'CaseSensitive' : False,
194
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1654 'Query' : { 'PatientName' : 'BRAINIX' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1655 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1656
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1657 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1658 'CaseSensitive' : False,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1659 'Query' : { 'PatientName' : 'BRAINIX\\KNEE\\NOPE' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1660 self.assertEqual(2, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1661
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1662 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1663 'CaseSensitive' : False,
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1664 'Query' : { 'PatientName' : '*n*' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1665 self.assertEqual(2, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1666
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1667 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1668 'CaseSensitive' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1669 'Query' : { 'PatientName' : '*n*' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1670 self.assertEqual(0, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1671
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1672 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1673 'Level' : 'Patient',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1674 'CaseSensitive' : False,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1675 'Query' : { 'PatientName' : '*ne*' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1676 self.assertEqual(1, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1677 self.assertEqual('20080822', a[0]['MainDicomTags']['PatientBirthDate'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1678
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1679 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1680 'CaseSensitive' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1681 'Query' : { 'PatientName' : '*ne*' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1682 self.assertEqual(0, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1683
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1684 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1685 'CaseSensitive' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1686 'Query' : { 'PatientName' : '*NE*' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1687 self.assertEqual(1, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1688
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1689 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1690 'CaseSensitive' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1691 'Query' : { 'PatientName' : '*NE*' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1692 self.assertEqual(2, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1693
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1694 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1695 'CaseSensitive' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1696 'Query' : { 'PatientName' : '*NE*' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1697 self.assertEqual(4, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1698
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1699 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', 'Query' : { }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1700 self.assertEqual(2, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1701
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1702 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', 'Query' : { }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1703 self.assertEqual(2, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1704
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1705 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', 'Query' : { }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1706 self.assertEqual(4, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1707
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1708 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', 'Query' : { }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1709 self.assertEqual(8, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1710
194
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1711 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1712 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1713 'Query' : { 'StudyDate' : '20061201-20061201' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1714 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1715 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1716
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1717 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1718 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1719 'Query' : { 'StudyDate' : '20061201-20091201' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1720 self.assertEqual(2, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1721 for i in range(2):
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1722 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE'])
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1723
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1724 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1725 'Query' : { 'StudyDate' : '20061202-20061202' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1726 self.assertEqual(0, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1727
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1728 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1729 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1730 'Query' : { 'StudyDate' : '-20061201' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1731 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1732 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1733
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1734 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1735 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1736 'Query' : { 'StudyDate' : '-20051201' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1737 self.assertEqual(0, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1738
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1739 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1740 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1741 'Query' : { 'StudyDate' : '20061201-' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1742 self.assertEqual(2, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1743 for i in range(2):
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1744 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE'])
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1745
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1746 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1747 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1748 'Query' : { 'StudyDate' : '20061202-' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1749 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1750 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1751
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1752 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1753 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1754 'Query' : { 'StudyDate' : '20080819-' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1755 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1756 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1757
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1758 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1759 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1760 'Query' : { 'StudyDate' : '20080820-' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1761 self.assertEqual(0, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1762
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1763
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1765 def test_rest_query_retrieve(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1766 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1767
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1768 # Upload 8 instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1769 for i in range(2):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1770 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1771 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1772 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1773 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1774
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1775 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1776 for p in DoGet(_REMOTE, '/patients'):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1777 DoPost(_REMOTE, '/modalities/orthanctest/store', p)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1778 DoDelete(_REMOTE, '/patients/%s' % p)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1779
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1780 for q in DoGet(_REMOTE, '/queries'):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1781 DoDelete(_REMOTE, '/queries/%s' % q)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1782
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1783 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1784 self.assertEqual(0, len(DoGet(_REMOTE, '/queries')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1785 a = DoPost(_REMOTE, '/modalities/orthanctest/query', { 'Level' : 'Series',
27
cde1691838d3 wildcard test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 26
diff changeset
1786 'Query' : {
cde1691838d3 wildcard test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 26
diff changeset
1787 'PatientName' : '*NE*',
cde1691838d3 wildcard test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 26
diff changeset
1788 'StudyDate' : '*',
cde1691838d3 wildcard test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 26
diff changeset
1789 }})['ID']
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1790 self.assertEqual(1, len(DoGet(_REMOTE, '/queries')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1791
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1792 b = DoGet(_REMOTE, '/queries/%s' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1793 self.assertTrue('answers' in b)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1794 self.assertTrue('level' in b)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1795 self.assertTrue('modality' in b)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1796 self.assertTrue('query' in b)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1797 self.assertTrue('retrieve' in b)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1798 self.assertEqual('Series', DoGet(_REMOTE, '/queries/%s/level' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1799 self.assertEqual('orthanctest', DoGet(_REMOTE, '/queries/%s/modality' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1800
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1801 q = DoGet(_REMOTE, '/queries/%s/query?simplify' % a)
27
cde1691838d3 wildcard test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 26
diff changeset
1802 self.assertEqual(2, len(q))
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1803 self.assertTrue('PatientName' in q)
27
cde1691838d3 wildcard test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 26
diff changeset
1804 self.assertTrue('StudyDate' in q)
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1805 self.assertEqual('*NE*', q['PatientName'])
27
cde1691838d3 wildcard test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 26
diff changeset
1806 self.assertEqual('*', q['StudyDate'])
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1807
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1808 self.assertEqual(2, len(DoGet(_REMOTE, '/queries/%s/answers' % a)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1809
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1810 s = DoGet(_REMOTE, '/queries/%s/answers/0' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1811 self.assertTrue('content' in s)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1812 self.assertTrue('retrieve' in s)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1813
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1814 s = DoGet(_REMOTE, '/queries/%s/answers/0/content?simplify' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1815 self.assertEqual('887', s['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1816 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', s['StudyInstanceUID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1817
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1818 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1819 DoPost(_REMOTE, '/queries/%s/answers/0/retrieve' % a, 'ORTHANC')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1820 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1821 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1822 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1823 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1824
112
9d09f6f21b60 added a test for issue #36
amazy
parents: 111
diff changeset
1825 DoPost(_REMOTE, '/queries/%s/answers/1/retrieve' % a, 'ORTHANC', 'application/json') # make sure the issue #36 is fixed (query/retrieve Rest API: /retrieve route shall accept application/json content type)
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1826 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1827 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1828 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1829 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1830
186
8feebc2bf9fc test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 183
diff changeset
1831 # New in Orthanc 1.4.3
8feebc2bf9fc test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 183
diff changeset
1832 s = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a)
8feebc2bf9fc test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 183
diff changeset
1833 self.assertEqual(2, len(s))
8feebc2bf9fc test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 183
diff changeset
1834 for i in range(2):
8feebc2bf9fc test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 183
diff changeset
1835 self.assertEqual('SERIES', s[i]['QueryRetrieveLevel'])
8feebc2bf9fc test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 183
diff changeset
1836 self.assertEqual('887', s[i]['PatientID'])
8feebc2bf9fc test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 183
diff changeset
1837 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', s[i]['StudyInstanceUID'])
8feebc2bf9fc test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 183
diff changeset
1838
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1839 DoDelete(_REMOTE, '/queries/%s' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1840 self.assertEqual(0, len(DoGet(_REMOTE, '/queries')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1841
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1842
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1843 def test_parent(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1844 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1845 patient = '6816cb19-844d5aee-85245eba-28e841e6-2414fae2'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1846 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1847 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1848 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d'
107
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
1849 self.assertEqual(instance, u)
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1850
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1851 a = DoGet(_REMOTE, '/studies/%s/patient' % study)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1852 self.assertEqual('Patient', a['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1853 self.assertEqual(patient, a['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1854
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1855 a = DoGet(_REMOTE, '/series/%s/patient' % series)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1856 self.assertEqual('Patient', a['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1857 self.assertEqual(patient, a['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1858
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1859 a = DoGet(_REMOTE, '/series/%s/study' % series)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1860 self.assertEqual('Study', a['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1861 self.assertEqual(study, a['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1862
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1863 a = DoGet(_REMOTE, '/instances/%s/patient' % instance)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1864 self.assertEqual('Patient', a['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1865 self.assertEqual(patient, a['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1866
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1867 a = DoGet(_REMOTE, '/instances/%s/study' % instance)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1868 self.assertEqual('Study', a['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1869 self.assertEqual(study, a['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1870
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1871 a = DoGet(_REMOTE, '/instances/%s/series' % instance)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1872 self.assertEqual('Series', a['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1873 self.assertEqual(series, a['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1874
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1875
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1876 def test_shanon(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1877 def Anonymize(instance, replacements = {}):
119
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
1878 return DoPost(_REMOTE, '/instances/%s/anonymize' % instance, {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
1879 'Replace' : replacements,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
1880 'Force' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
1881 }, 'application/json')
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1882
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1883 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1884 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1885 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1886
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1887 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1888 ids = [ 'ozp00SjY2xG',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1889 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1890 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1891 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1892
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1893 a = ExtractDicomTags(Anonymize(u), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1894 for i in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1895 self.assertNotEqual(ids[i], a[i])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1896 self.assertTrue(a[4].startswith('Orthanc'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1897
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1898 a = ExtractDicomTags(Anonymize(u, { 'PatientName' : 'toto' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1899 for i in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1900 self.assertNotEqual(ids[i], a[i])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1901 self.assertFalse(a[4].startswith('Orthanc'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1902
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1903 a = ExtractDicomTags(Anonymize(u, { 'SOPInstanceUID' : 'instance' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1904 self.assertEqual('instance', a[3])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1905 self.assertFalse(a[4].startswith('Orthanc'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1906
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1907 a = ExtractDicomTags(Anonymize(u, { 'SeriesInstanceUID' : 'series' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1908 self.assertEqual('series', a[2])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1909 self.assertFalse(a[4].startswith('Orthanc'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1910
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1911 a = ExtractDicomTags(Anonymize(u, { 'StudyInstanceUID' : 'study' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1912 self.assertEqual('study', a[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1913 self.assertFalse(a[4].startswith('Orthanc'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1914
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1915 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1916 self.assertEqual('patient', a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1917 self.assertFalse(a[4].startswith('Orthanc'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1918
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1919 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1920 'StudyInstanceUID' : 'study',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1921 'SeriesInstanceUID' : 'series',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1922 'SOPInstanceUID' : 'instance' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1923 self.assertEqual('patient', a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1924 self.assertFalse(a[4].startswith('Orthanc'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1925
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1926 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1927
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1928
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1929 def test_shanon_2(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1930 def Modify(instance, replacements = {}):
119
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
1931 return DoPost(_REMOTE, '/instances/%s/modify' % instance, {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
1932 'Replace' : replacements,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
1933 'Force': True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
1934 }, 'application/json')
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1935
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1936 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1937 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1938 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1939
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1940 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1941 ids = [ 'ozp00SjY2xG',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1942 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1943 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1944 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1945
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1946 a = ExtractDicomTags(Modify(u), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1947 self.assertEqual(ids[0], a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1948 self.assertEqual(ids[1], a[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1949 self.assertEqual(ids[2], a[2])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1950 self.assertNotEqual(ids[3], a[3])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1951 self.assertEqual(0, len(a[4]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1952
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1953 a = ExtractDicomTags(Modify(u, { 'SOPInstanceUID' : 'instance' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1954 self.assertEqual(ids[0], a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1955 self.assertEqual(ids[1], a[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1956 self.assertEqual(ids[2], a[2])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1957 self.assertEqual('instance', a[3])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1958
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1959 a = ExtractDicomTags(Modify(u, { 'SeriesInstanceUID' : 'series' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1960 self.assertEqual(ids[0], a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1961 self.assertEqual(ids[1], a[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1962 self.assertEqual('series', a[2])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1963 self.assertNotEqual(ids[3], a[3])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1964
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1965 a = ExtractDicomTags(Modify(u, { 'StudyInstanceUID' : 'study' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1966 self.assertEqual(ids[0], a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1967 self.assertEqual('study', a[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1968 self.assertNotEqual(ids[2], a[2])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1969 self.assertNotEqual(ids[3], a[3])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1970
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1971 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1972 self.assertEqual('patient', a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1973 self.assertNotEqual(ids[1], a[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1974 self.assertNotEqual(ids[2], a[2])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1975 self.assertNotEqual(ids[3], a[3])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1976
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1977 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1978 'StudyInstanceUID' : 'study',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1979 'SeriesInstanceUID' : 'series',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1980 'SOPInstanceUID' : 'instance' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1981 self.assertEqual('patient', a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1982 self.assertEqual('study', a[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1983 self.assertEqual('series', a[2])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1984 self.assertEqual('instance', a[3])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1985
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1986 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1987
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1988
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1989 def test_instances_tags(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1990 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1991 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1992 #a = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386937.676343')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1993 #b = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386925.676329')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1994
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1995 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/patients')[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1996 self.assertEqual(2, len(i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1997 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1998 self.assertEqual('887', i[i.keys()[1]]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1999
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2000 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/studies')[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2001 self.assertEqual(2, len(i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2002 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2003 self.assertEqual('887', i[i.keys()[1]]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2004
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2005 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2006 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2007 self.assertEqual(1, len(i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2008 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2009
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2010 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2011 self.assertEqual(1, len(i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2012 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2013
136
5634ef96fcc5 testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 133
diff changeset
2014 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
2015 self.assertEqual(1, len(i))
5634ef96fcc5 testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 133
diff changeset
2016 self.assertEqual('887', i[i.keys()[0]]['0010,0020'])
5634ef96fcc5 testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 133
diff changeset
2017
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2019 def test_lookup(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2020 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2021 self.assertEqual(0, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2023 UploadInstance(_REMOTE, 'DummyCT.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2025 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2026 self.assertEqual(1, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2027 self.assertEqual('Patient', a[0]['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2028 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', a[0]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2029 self.assertEqual('/patients/%s' % a[0]['ID'], a[0]['Path'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2030
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2031 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2032 self.assertEqual(1, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2033 self.assertEqual('Study', a[0]['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2034 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', a[0]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2035 self.assertEqual('/studies/%s' % a[0]['ID'], a[0]['Path'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2036
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2037 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2038 self.assertEqual(1, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2039 self.assertEqual('Series', a[0]['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2040 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', a[0]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2041 self.assertEqual('/series/%s' % a[0]['ID'], a[0]['Path'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2042
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2043 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2044 self.assertEqual(1, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2045 self.assertEqual('Instance', a[0]['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2046 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a[0]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2047 self.assertEqual('/instances/%s' % a[0]['ID'], a[0]['Path'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2048
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2049 DropOrthanc(_REMOTE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2050 a = DoPost(_REMOTE, '/tools/lookup', '3113719P')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2051 self.assertEqual(0, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2052
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2053
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2054 def test_autorouting(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2055 knee1 = 'Knee/T1/IM-0001-0001.dcm'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2056 knee2 = 'Knee/T2/IM-0001-0002.dcm'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2057 other = 'Brainix/Flair/IM-0001-0001.dcm'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2058
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2059 # Check that this version is >= 0.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2060 self.assertTrue(IsDefinedInLua(_REMOTE, '_InitializeJob'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2061 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2062
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2063 UploadInstance(_REMOTE, knee1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2064 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2065
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2066 DropOrthanc(_REMOTE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2067 DropOrthanc(_LOCAL)
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2068 InstallLuaScriptFromPath(_REMOTE, 'Lua/Autorouting.lua')
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2069 UploadInstance(_REMOTE, knee1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2070 UploadInstance(_REMOTE, knee2)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2071 UploadInstance(_REMOTE, other)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2072 WaitEmpty(_REMOTE)
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2073 UninstallLuaCallbacks(_REMOTE)
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2074 self.assertEqual(3, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2075
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2076 DropOrthanc(_REMOTE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2077 DropOrthanc(_LOCAL)
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2078 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingConditional.lua')
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2079 UploadInstance(_REMOTE, knee1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2080 UploadInstance(_REMOTE, knee2)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2081 UploadInstance(_REMOTE, other)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2082 WaitEmpty(_REMOTE)
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2083 UninstallLuaCallbacks(_REMOTE)
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2084 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2085
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2086 DropOrthanc(_REMOTE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2087 DropOrthanc(_LOCAL)
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2088 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingModification.lua')
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2089 UploadInstance(_REMOTE, knee1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2090 WaitEmpty(_REMOTE)
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2091 UninstallLuaCallbacks(_REMOTE)
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2092 i = DoGet(_LOCAL, '/instances')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2093 self.assertEqual(1, len(i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2094
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2095 with tempfile.NamedTemporaryFile(delete = True) as f:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2096 f.write(DoGet(_LOCAL, '/instances/%s/file' % i[0]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2097 f.flush()
45
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 44
diff changeset
2098 routed = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ])
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2099 self.assertEqual('My Medical Device', re.search('"StationName">(.*?)<', routed).group(1).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2100 self.assertEqual(None, re.search('"MilitaryRank"', routed))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2101 self.assertEqual(None, re.search('"0051,0010"', routed)) # A private tag
17
7c8500991a12 karsten
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
2102
7c8500991a12 karsten
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
2103
7c8500991a12 karsten
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
2104 def test_storescu_rf(self):
7c8500991a12 karsten
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
2105 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
7c8500991a12 karsten
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
2106 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
7c8500991a12 karsten
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
2107 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
7c8500991a12 karsten
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
2108 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
18
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2109
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2110
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2111 def test_anonymize_instance(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2112 def AnonymizeAndUpload(instanceId, parameters):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2113 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/anonymize' % instanceId, parameters,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2114 'application/json'), 'application/dicom')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2115
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2116 def ModifyAndUpload(instanceId, parameters):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2117 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/modify' % instanceId, parameters,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2118 'application/json'), 'application/dicom')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2119
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2120 a = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2121 s1 = DoGet(_REMOTE, '/instances/%s/content/PatientName' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2122 s2 = DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % a) # Some private tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2123 s3 = DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2124 s4 = DoGet(_REMOTE, '/instances/%s/content/SeriesDescription' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2125 s5 = DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2126
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2127 b = AnonymizeAndUpload(a, '{}')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2128 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2129 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2130
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2131 # Keep private tag (only OK since Orthanc 0.8.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2132 b = AnonymizeAndUpload(a, '{"Keep":["00e1-10c2"]}')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2133 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2134 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2135
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2136 b = AnonymizeAndUpload(a, '{"Keep":["00e1,10c2","PatientName"]}')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2137 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2138 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2139
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2140 b = AnonymizeAndUpload(a, '{"Keep":["PatientName"],"Replace":{"00e1,10c2":"Hello"}}')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2141 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2142 self.assertTrue(DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b).startswith('Hello'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2143
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2144 # Examples from the Wiki
118
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
2145 b = AnonymizeAndUpload(a, '{"Replace":{"PatientName":"hello","0010-0020":"world"},"Keep":["StudyDescription", "SeriesDescription"],"KeepPrivateTags": true,"Force":true}')
18
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2146 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2147 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2148 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2149 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2150 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2151 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2152 DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2153 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2154
118
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
2155 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Remove":["InstitutionName"],"RemovePrivateTags": true,"Force":true}')
18
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2156 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2157 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2158 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2159 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2160 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2161 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2162
118
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
2163 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Force":true}')
18
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2164 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2165 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2166 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1,10c2' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2167 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2168 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2169 self.assertEqual(s5, DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2170
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2171
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2172 # Test modify non-existing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2173 i = DoPost(_REMOTE, '/tools/create-dicom',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2174 json.dumps({
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2175 'PatientName' : 'Jodogne',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2176 'Modality' : 'CT',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2177 }))['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2178
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2179 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2180 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2181 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2182
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2183 b = ModifyAndUpload(i, '{"Replace":{"StudyDescription":"hello","Modality":"world"}}')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2184 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2185 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2186 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/Modality' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2187
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2188
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2189 def test_incoming_jpeg(self):
61
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2190 def storescu(image, acceptUnknownSopClassUid):
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2191 if acceptUnknownSopClassUid:
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2192 tmp = [ '-xf', GetDatabasePath('UnknownSopClassUid.cfg'), 'Default' ]
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2193 else:
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2194 tmp = [ '-xs' ]
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2195
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2196 with open(os.devnull, 'w') as FNULL:
61
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2197 subprocess.check_call([ FindExecutable('storescu') ] + tmp +
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2198 [ _REMOTE['Server'], str(_REMOTE['DicomPort']),
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2199 GetDatabasePath(image) ],
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2200 stderr = FNULL)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2201
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2202 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2203 InstallLuaScriptFromPath(_REMOTE, 'Lua/TransferSyntaxDisable.lua')
61
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2204 self.assertRaises(Exception, lambda: storescu('Knix/Loc/IM-0001-0001.dcm', False))
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2205 self.assertRaises(Exception, lambda: storescu('UnknownSopClassUid.dcm', True))
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2206 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2207 InstallLuaScriptFromPath(_REMOTE, 'Lua/TransferSyntaxEnable.lua')
62
f9c4ce95756f removal of useless information
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
2208 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
2209 storescu('Knix/Loc/IM-0001-0001.dcm', False)
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2210 storescu('UnknownSopClassUid.dcm', True)
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2211 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2212
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2213
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2214 def test_storescu_jpeg(self):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2215 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2216
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2217 knixStudy = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
64
369e439cdfd6 test access header
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 63
diff changeset
2218 i = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm')['ID']
369e439cdfd6 test access header
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 63
diff changeset
2219
369e439cdfd6 test access header
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 63
diff changeset
2220 # This is JPEG lossless
136
5634ef96fcc5 testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 133
diff changeset
2221 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header' % i)['0002,0010']['Value'])
64
369e439cdfd6 test access header
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 63
diff changeset
2222 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
2223 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header?short' % i)['0002,0010'])
64
369e439cdfd6 test access header
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 63
diff changeset
2224
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2225 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm')
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2226 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0003.dcm')
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2227
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2228 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
2229 b = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2230 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2231 DoPost(_REMOTE, '/modalities/orthanctest/store', [ knixStudy, a, b ])
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2232 self.assertEqual(5, len(DoGet(_LOCAL, '/instances')))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2233
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2234 self.assertEqual(3, len(DoGet(_REMOTE, '/exports')['Exports']))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2235
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2236 DropOrthanc(_REMOTE)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2237 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2238
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2239
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2240 def test_pixel_data(self):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2241 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
2242 color = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2243 phenix = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2244
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2245 phenixSize = 358 * 512 * 2
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2246 colorSize = 1000 * 1000 * 3
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2247 jpegSize = 51918
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2248
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2249 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
2250 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
2251 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
2252
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2253 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
2254 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
2255
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2256 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
2257 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
2258
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2259
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2260 def test_decode_brainix(self):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2261 brainix = [
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2262 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'], # (*)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2263 UploadInstance(_REMOTE, 'Formats/JpegLossless.dcm')['ID'], # JPEG-LS, same as (*) (since Orthanc 0.7.6)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2264 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
2265 ]
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2266 h = '6fb11b932d535c2be04beabd99793ff8'
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2267 maxValue = 426.0
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2268
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2269 truth = Image.open(GetDatabasePath('Formats/Brainix.png'))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2270 for i in brainix:
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2271 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % i)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2272 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % i)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2273
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2274 truth2 = map(lambda x: min(255, x), truth.getdata())
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2275 for i in brainix:
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2276 self.AssertSameImages(truth2, '/instances/%s/image-uint8' % i)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2277
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2278 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
2279 for i in brainix:
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2280 self.AssertSameImages(truth2, '/instances/%s/preview' % i)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2281
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2282 for i in brainix:
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2283 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
2284
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2285
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2286 def test_decode_color(self):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2287 imagej = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2288 color = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2289
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2290 for i in [ imagej, color ]:
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2291 for j in [ 'image-uint8', 'image-uint16', 'image-int16' ]:
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2292 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
2293
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2294 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
2295 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
2296
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2297 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
2298 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
2299
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2300
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2301 def test_decode_rf(self):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2302 rf = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2303 truth = Image.open(GetDatabasePath('Formats/KarstenHilbertRF.png'))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2304
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2305 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % rf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2306 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % rf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2307 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % rf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2308 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % rf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2309
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2310 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
2311
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2312
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2313 def test_decode_multiframe(self):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2314 mf = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2315
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2316 # Test the first frame
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2317 truth = Image.open(GetDatabasePath('Formats/Multiframe0.png'))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2318 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % mf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2319 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % mf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2320 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % mf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2321 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % mf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2322 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
2323
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2324 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
2325
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2326 # Test the last frame
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2327 truth = Image.open(GetDatabasePath('Formats/Multiframe75.png'))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2328 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
2329
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2330
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2331 def test_decode_signed(self):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2332 signed = UploadInstance(_REMOTE, 'SignedCT.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2333 minValue = -2000
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2334 maxValue = 4042
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2335
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2336 truth = Image.open(GetDatabasePath('Formats/SignedCT.png'))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2337 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % signed)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2338
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2339 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
2340 self.AssertSameImages(truth2, '/instances/%s/image-uint16' % signed)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2341
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2342 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
2343 self.AssertSameImages(truth3, '/instances/%s/image-uint8' % signed)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2344
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2345 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
2346 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
2347 self.AssertSameImages(tmp, '/instances/%s/preview' % signed)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2348
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2349 self.assertEqual('b57e6c872a3da50877c7da689b03a444', ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % signed)))
22
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2350
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2351
46
85b2e36ed392 explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 45
diff changeset
2352 def test_googlecode_issue_32(self):
92
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2353 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/default-encoding', 'nope'))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2354 self.assertEqual('Windows1251', DoPut(_REMOTE, '/tools/default-encoding', 'Windows1251'))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2355 self.assertEqual('Windows1251', DoGet(_REMOTE, '/tools/default-encoding'))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2356
22
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2357 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2358 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2359 self.assertEqual(u'Рентгенография', tags['SeriesDescription'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2360 self.assertEqual(u'Таз', tags['BodyPartExamined'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2361 self.assertEqual(u'Прямая', tags['ViewPosition'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2362
92
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2363 # 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
2364 self.assertEqual('Latin1', DoPut(_REMOTE, '/tools/default-encoding', 'Latin1'))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2365
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2366 DoDelete(_REMOTE, '/instances/%s' % f)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2367 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID']
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2368 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2369 self.assertNotEqual(u'Рентгенография', tags['SeriesDescription'])
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2370
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2371
22
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2372 def test_encodings(self):
23
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2373 # Latin-1 (ISO_IR 100)
22
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2374 brainix = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2375 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % brainix)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2376 self.assertEqual(u'IRM cérébrale, neuro-crâne', tags['StudyDescription'])
23
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2377
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2378 # Latin-2 (ISO_IR 101)
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2379 a = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID']
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2380 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % a)
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2381 # dcm2xml MarekLatin2.dcm | iconv -f latin2 -t utf-8 | xmllint --format -
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2382 self.assertEqual('Imię i Nazwisko osoby opisującej',
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2383 i['ContentSequence'][4]['ConceptNameCodeSequence'][0]['CodeMeaning'].encode('utf-8'))
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2384
26
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2385
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2386 def test_storescu_custom_aet(self):
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2387 # 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
2388 # 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
2389 # in the REST API)."
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2390 # 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
2391
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2392 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2393
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2394 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2395 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2396 c = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0003.dcm')
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2397
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2398 j = DoPost(_REMOTE, '/modalities/orthanctest/store', {
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2399 'LocalAet' : 'YOP',
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2400 'Resources' : [ a['ID'], b['ID'] ]
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2401 })
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2402
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2403 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2404 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
2405
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2406 DropOrthanc(_LOCAL)
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2407 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2408
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2409 j = DoPost(_REMOTE, '/modalities/orthanctest/store', {
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2410 'Resources' : [ c['ID'] ]
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2411 })
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2412
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2413 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2414 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
2415
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2416 DropOrthanc(_REMOTE)
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2417 DropOrthanc(_LOCAL)
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2418
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2419 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingChangeAet.lua')
26
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2420 DoPost(_REMOTE, '/tools/execute-script', 'aet = "HELLO"', 'application/lua')
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2421
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2422 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2423 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2424 WaitEmpty(_REMOTE)
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2425 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2426 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
2427
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2428 DoPost(_REMOTE, '/tools/execute-script', 'aet = nill', 'application/lua')
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2429 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2430 WaitEmpty(_REMOTE)
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2431 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2432 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
2433
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
2434 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
2435 # 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
2436 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
2437 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
2438 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
2439 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
2440 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
2441
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
2442 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
2443 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
2444 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
2445 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
2446
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
2447 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
2448 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
2449
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
2450 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=0&limit=0')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
2451 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
2452 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
2453 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
2454 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
2455 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
2456 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
2457 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
2458 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
2459 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
2460 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
2461 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
2462 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
2463 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
2464 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
2465
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
2466 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
2467 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
2468 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
2469 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
2470 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
2471 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
2472 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
2473
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
2474 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
2475 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
2476 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
2477
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
2478 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
2479 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
2480 self.assertTrue(instance in s)
36
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2481
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2482
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2483 def test_create_pdf(self):
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2484 # Upload 4 instances
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2485 brainixInstance = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2486 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2487 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2488 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2489
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2490 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0'
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2491 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988'
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2492 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8'
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2493
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2494 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f:
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2495 pdf = f.read()
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2496
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2497 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2498 json.dumps({
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2499 'Tags' : {
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2500 'PatientName' : 'Jodogne',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2501 'Modality' : 'CT',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2502 },
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2503 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2504 }))
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2505
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2506 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip())
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2507 self.assertEqual('OT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip())
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2508
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2509 b = DoGet(_REMOTE, '/instances/%s/content/0042-0011' % i['ID'])
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2510 self.assertEqual(len(b), len(pdf) + 1)
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2511 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf + '\0'))
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2512
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2513 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2514 json.dumps({
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2515 'Parent' : brainixPatient,
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2516 'Tags' : {
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2517 'PatientName' : 'Jodogne',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2518 }
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2519 })))
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2520
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2521 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2522 json.dumps({
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2523 'Parent' : brainixPatient,
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2524 'Tags' : { 'StudyDescription' : 'PDF^Patient' },
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2525 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2526 }))
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2527
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2528 self.assertEqual(brainixPatient, DoGet(_REMOTE, '/instances/%s/patient' % i['ID'])['ID'])
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2529
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2530 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2531 json.dumps({
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2532 'Parent' : brainixStudy,
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2533 'Tags' : { 'SeriesDescription' : 'PDF^Study' },
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2534 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2535 }))
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2536
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2537 self.assertEqual(brainixStudy, DoGet(_REMOTE, '/instances/%s/study' % i['ID'])['ID'])
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2538
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2539 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2540 json.dumps({
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2541 'Parent' : brainixEpi,
37
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 36
diff changeset
2542 'Tags' : { 'SpecificCharacterSet' : 'ISO_IR 13' },
36
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2543 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2544 }))
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2545
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2546 self.assertEqual(brainixEpi, DoGet(_REMOTE, '/instances/%s/series' % i['ID'])['ID'])
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2547
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2548 b = DoGet(_REMOTE, '/instances/%s/pdf' % i['ID'])
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2549 self.assertEqual(len(b), len(pdf))
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2550 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf))
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2551
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2552 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/pdf' % brainixInstance))
38
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2553
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2554
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2555 def test_create_series(self):
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2556 i = DoPost(_REMOTE, '/tools/create-dicom',
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2557 json.dumps({
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2558 'Tags' : {
40
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2559 'SpecificCharacterSet' : 'ISO_IR 100',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2560 'PatientName' : 'Sébastien Jodogne',
38
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2561 'Modality' : 'CT',
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2562 },
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2563 'Content' : [
40
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2564 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2565 'Content': 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==', # red dot in RGBA
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2566 'Tags' : { 'ImageComments' : 'Tutu' }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2567 },
38
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2568 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAoUlEQVQ4jZ2SWw3EIBREjwUsYAELa2EtoAULFUCyXAtroRZqoRbox254BdLC/DZnZjoXWJFgCDg8egW2CBEhEnDzyRk+Ecxz2KP/0AL8S99T+jQccAVs22qKwAuPuq0uyNg9cPLh3am+pe/dkHLZtqJHj6vXJrZ7nvzvxxgemXgUwnGfXqpee09mUwp8m022OYP6bLF7mVuVe0y/umxinsAXRd9z0k1ubWsAAAAASUVORK5CYII=',
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2569 ]
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2570 }))
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2571
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2572 s = DoGet(_REMOTE, i['Path'])
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2573 self.assertEqual('Series', s['Type'])
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2574 self.assertEqual(s['ID'], i['ID'])
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2575 self.assertEqual(2, len(s['Instances']))
39
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 38
diff changeset
2576 self.assertEqual(2, s['ExpectedNumberOfInstances'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 38
diff changeset
2577 self.assertEqual('Complete', s['Status'])
40
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2578
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2579 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2580 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2581 self.assertTrue('ImageComments' in a or 'ImageComments' in b)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2582 if 'ImageComments' in a:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2583 self.assertEqual('Tutu', a['ImageComments'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2584 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2585 self.assertEqual('Tutu', b['ImageComments'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2586
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2587 patient = DoGet(_REMOTE, '/instances/%s/patient' % s['Instances'][0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2588 self.assertEqual(patient['MainDicomTags']['PatientName'].encode('utf-8'),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2589 'Sébastien Jodogne')
47
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2590
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2591
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2592 def test_create_binary(self):
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2593 binary = ''.join(map(chr, range(256)))
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2594 encoded = 'data:application/octet-stream;base64,' + base64.b64encode(binary)
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2595 tags = {
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2596 'PatientName' : 'Jodogne',
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2597 '8899-8899' : encoded
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2598 }
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2599
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2600 i = DoPost(_REMOTE, '/tools/create-dicom',
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2601 json.dumps({
266
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
2602 'Tags' : tags,
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
2603 'PrivateCreator' : 'TestBinary',
47
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2604 }))
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2605
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2606 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip())
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2607 self.assertEqual(binary, DoGet(_REMOTE, '/instances/%s/content/8899-8899' % i['ID']).strip())
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2608
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2609 i = DoPost(_REMOTE, '/tools/create-dicom',
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2610 json.dumps({
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2611 'InterpretBinaryTags' : False,
266
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
2612 'Tags' : tags,
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
2613 'PrivateCreator' : 'TestBinary',
47
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2614 }))
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2615
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2616 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip())
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2617 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
2618
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2619
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2620 def test_patient_ids_collision(self):
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2621 # 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
2622 # same PatientID
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2623 for i in range(3):
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2624 UploadInstance(_REMOTE, 'PatientIdsCollision/Image%d.dcm' % (i + 1))
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2625
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2626 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2627 'Query' : { 'PatientName' : '*' }})
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2628 self.assertEqual(1, len(a))
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2629 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
2630
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2631 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2632 'CaseSensitive' : True,
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2633 'Query' : { 'PatientName' : 'FOO\\HELLO' }})
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2634 self.assertEqual(2, len(a))
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2635
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2636 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2637 'CaseSensitive' : False,
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2638 'Query' : { 'PatientName' : 'Foo' }})
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2639 self.assertEqual(1, len(a))
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2640 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
2641 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
2642 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
2643
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2644 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2645 'Query' : { 'PatientName' : '*' }})
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2646 self.assertEqual(3, len(a))
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2647 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
2648 self.assertTrue('FOO^SERIES' in d)
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2649 self.assertTrue('HELLO^SERIES' in d)
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2650 self.assertTrue('WORLD^SERIES' in d)
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2651
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2652 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
2653 self.assertEqual(1, len(set(d)))
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2654 self.assertEqual('COMMON', d[0])
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2655
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2656 for i in a:
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2657 d = DoGet(_REMOTE, '/studies/%s' % i) ['MainDicomTags']['StudyDescription']
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2658 p = DoGet(_REMOTE, '/studies/%s' % i) ['PatientMainDicomTags']['PatientName']
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
2659 self.assertEqual('%s^SERIES' % p, d)
49
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2660
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2661
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2662 def test_bitbucket_issue_4(self):
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2663 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2664 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2665 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2666 UploadInstance(_REMOTE, 'Formats/Jpeg.dcm')
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2667 UploadInstance(_REMOTE, 'Formats/JpegLossless.dcm')
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2668 UploadInstance(_REMOTE, 'Formats/Rle.dcm')
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2669
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2670 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2671 self.assertEqual(6, len(DoGet(_REMOTE, '/instances')))
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2672
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2673 p = DoGet(_REMOTE, '/patients')
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2674 self.assertEqual(2, len(p))
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2675 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
2676 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
2677 self.assertEqual(3, len(i1))
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2678 self.assertEqual(3, len(i2))
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2679
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2680 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
2681
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
2682 self.assertEqual(6, len(DoGet(_LOCAL, '/instances')))
50
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
2683
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
2684
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
2685 def test_create_sequence(self):
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
2686 i = DoPost(_REMOTE, '/tools/create-dicom',
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
2687 json.dumps({
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
2688 'Tags' : {
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
2689 'SpecificCharacterSet': 'ISO_IR 100', # Encode using Latin1
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
2690 'PatientName': 'Jodogne^',
51
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2691 'ReferencedStudySequence': GenerateTestSequence(),
50
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
2692 }
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
2693 }))['ID']
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
2694
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
2695 self.assertEqual('Jodogne^', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i))
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
2696 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
2697 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
2698 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
2699 self.assertEqual(u'Sébastien^'.encode('latin-1'),
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
2700 DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence/1/StudyDescription' % i))
51
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2701
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2702
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2703 def test_modify_sequence(self):
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2704 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID']
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2705 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
2706
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2707 j = DoPost(_REMOTE, '/instances/%s/modify' % i,
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2708 json.dumps({
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2709 "Replace" : {
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2710 "PatientName" : "hello",
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2711 'ReferencedStudySequence': GenerateTestSequence(),
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2712 },
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2713 }),
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2714 'application/json')
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2715 j = DoPost(_REMOTE, '/instances', j, 'application/dicom')['ID']
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2716 DoDelete(_REMOTE, '/instances/%s' % i)
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
2717
52
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2718 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence' % j)))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2719
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2720
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2721 def test_compression(self):
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2722 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2723
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2724 data = DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom-as-json/data' % i)[1]
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2725
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2726 # "StorageCompression" is enabled in the Orthanc to be tested,
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2727 # uncompress the data before running the test
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2728 if DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/is-compressed' % i) != 0:
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2729 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/uncompress' % i)
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2730
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2731 cs = DoGet(_REMOTE, '/statistics')['TotalDiskSize']
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2732 us = DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2733 size = DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % i)
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2734 md5 = DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/md5' % i)
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2735 self.assertEqual(data, DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-data' % i)[1])
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2736 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-md5' % i))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2737 self.assertEqual(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-size' % i))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2738
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2739 ops = DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json' % i)
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2740 self.assertTrue('compress' in ops)
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2741 self.assertTrue('uncompress' in ops)
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2742 self.assertTrue('is-compressed' in ops)
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2743 self.assertEqual(0, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/is-compressed' % i))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2744 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/verify-md5' % i)
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2745
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2746 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/compress' % i)
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2747 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/verify-md5' % i)
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2748 self.assertEqual(1, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/is-compressed' % i))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2749 self.assertLess(cs, DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2750 self.assertEqual(us, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2751 self.assertGreater(len(data), len(DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-data' % i)[1]))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2752 self.assertGreater(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-size' % i))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2753 self.assertEqual(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % i))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2754 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/md5' % i))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2755 self.assertNotEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-md5' % i))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2756
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2757 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/uncompress' % i)
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2758 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/verify-md5' % i)
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2759 self.assertEqual(0, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/is-compressed' % i))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2760 self.assertEqual(data, DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-data' % i)[1])
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2761 self.assertEqual(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-size' % i))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2762 self.assertEqual(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % i))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2763 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/md5' % i))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2764 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-md5' % i))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2765 self.assertEqual(cs, DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
2766 self.assertEqual(us, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
53
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2767
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2768
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2769 def test_ordered_slices(self):
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2770 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2771 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2772 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s)
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2773 self.assertEqual('Sequence', o['Type'])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2774 self.assertEqual(1, len(o['Dicom']))
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2775 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/file', o['Dicom'][0])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2776 self.assertEqual(76, len(o['Slices']))
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2777 for j in range(76):
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2778 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/frames/%d' % j, o['Slices'][j])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2779
68
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2780 self.assertEqual(1, len(o['SlicesShort']))
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2781 self.assertEqual('9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02', o['SlicesShort'][0][0])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2782 self.assertEqual(0, o['SlicesShort'][0][1])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2783 self.assertEqual(76, o['SlicesShort'][0][2])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2784
53
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2785 i = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2786 j = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')['ID']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2787 k = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')['ID']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2788 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2789 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s)
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2790
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2791 self.assertEqual('Volume', o['Type'])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2792 self.assertEqual(3, len(o['Dicom']))
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2793 self.assertEqual(3, len(o['Slices']))
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2794 self.assertEqual('/instances/%s/file' % i, o['Dicom'][2])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2795 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2796 self.assertEqual('/instances/%s/file' % k, o['Dicom'][0])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2797 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][2])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2798 self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2799 self.assertEqual('/instances/%s/frames/0' % k, o['Slices'][0])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2800
68
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2801 self.assertEqual(3, len(o['SlicesShort']))
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2802 self.assertEqual(k, o['SlicesShort'][0][0])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2803 self.assertEqual(0, o['SlicesShort'][0][1])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2804 self.assertEqual(1, o['SlicesShort'][0][2])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2805 self.assertEqual(j, o['SlicesShort'][1][0])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2806 self.assertEqual(0, o['SlicesShort'][1][1])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2807 self.assertEqual(1, o['SlicesShort'][1][2])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2808 self.assertEqual(i, o['SlicesShort'][2][0])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2809 self.assertEqual(0, o['SlicesShort'][2][1])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2810 self.assertEqual(1, o['SlicesShort'][2][2])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2811
53
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2812 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2813 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm')['ID']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2814 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2815 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s)
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2816
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2817 self.assertEqual('Sequence', o['Type'])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2818 self.assertEqual(2, len(o['Dicom']))
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2819 self.assertEqual(2, len(o['Slices']))
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2820 self.assertEqual('/instances/%s/file' % i, o['Dicom'][0])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2821 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2822 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][0])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
2823 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
2824
68
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2825 self.assertEqual(2, len(o['SlicesShort']))
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2826 self.assertEqual(i, o['SlicesShort'][0][0])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2827 self.assertEqual(0, o['SlicesShort'][0][1])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2828 self.assertEqual(1, o['SlicesShort'][0][2])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2829 self.assertEqual(j, o['SlicesShort'][1][0])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2830 self.assertEqual(0, o['SlicesShort'][1][1])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2831 self.assertEqual(1, o['SlicesShort'][1][2])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2832
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
2833
54
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
2834
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
2835 def test_incoming_movescu_accession(self):
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
2836 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
2837
137
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
2838 # No matching patient, so no job is created
54
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
2839 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
2840 CallMoveScu([ '--study', '-k', '0008,0052=STUDY', '-k', 'AccessionNumber=nope' ])
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
2841 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
2842 CallMoveScu([ '--study', '-k', '0008,0052=PATIENT', '-k', 'AccessionNumber=A10003245599' ])
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
2843 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
137
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
2844
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
2845 # 1 Matching patient, track the job
138
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
2846 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
2847 '--study',
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
2848 '-k', '0008,0052=STUDY',
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
2849 '-k', 'AccessionNumber=A10003245599'
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
2850 ])))
137
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
2851
54
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
2852 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
2853
55
a395fd51cc4f test_dicom_to_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 54
diff changeset
2854
a395fd51cc4f test_dicom_to_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 54
diff changeset
2855 def test_dicom_to_json(self):
a395fd51cc4f test_dicom_to_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 54
diff changeset
2856 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
2857 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
2858
cd3c7f70f139 test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 59
diff changeset
2859 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
2860 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
2861 self.assertTrue(CompareTags(t, json.loads(f.read()), [
123
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
2862 # Tags for compatibility with DCMTK 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
2863 'RETIRED_OtherPatientIDs',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
2864 'OtherPatientIDs',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
2865 'ACR_NEMA_2C_VariablePixelDataGroupLength',
80
8466dbfcb22b fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
2866 ]))
55
a395fd51cc4f test_dicom_to_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 54
diff changeset
2867
a395fd51cc4f test_dicom_to_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 54
diff changeset
2868 t = DoGet(_REMOTE, '/instances/%s/tags' % i)
a395fd51cc4f test_dicom_to_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 54
diff changeset
2869 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
2870 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
2871 ]))
55
a395fd51cc4f test_dicom_to_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 54
diff changeset
2872
60
cd3c7f70f139 test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 59
diff changeset
2873 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
2874 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
2875 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
2876 ]))
60
cd3c7f70f139 test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 59
diff changeset
2877
cd3c7f70f139 test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 59
diff changeset
2878 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
2879 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
2880 a = json.loads(f.read())
65
09fc27e0899a patch for testing windows builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
2881 aa = json.dumps(a).replace('2e+022', '2e+22')
09fc27e0899a patch for testing windows builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
2882 tt = json.dumps(t).replace('2e+022', '2e+22')
09fc27e0899a patch for testing windows builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
2883 self.assertEqual(aa, tt)
57
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2884
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2885
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2886 def test_batch_archive(self):
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2887 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2888 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2889 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2890 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0002.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2891 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2892 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2893 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2894 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2895
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2896 s = DoPost(_REMOTE, '/tools/create-archive', [ ])
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2897 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2898 self.assertEqual(0, len(z.namelist()))
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2899
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2900 # One patient
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2901 s = DoPost(_REMOTE, '/tools/create-archive', [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ])
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2902 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2903 self.assertEqual(4, len(z.namelist()))
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2904
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2905 # One patient + twice its study + one series from other patient
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2906 s = DoPost(_REMOTE, '/tools/create-archive', [
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2907 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17',
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2908 '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918',
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2909 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0'
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2910 ])
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2911 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2912 self.assertEqual(6, len(z.namelist()))
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2913
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2914 # One patient + one series + one instance
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2915 s = DoPost(_REMOTE, '/tools/create-archive', [
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2916 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17',
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2917 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0',
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2918 '1d429ccb-bdcc78a1-7d129d6a-ba4966ed-fe4dbd87'
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2919 ])
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2920 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
2921 self.assertEqual(7, len(z.namelist()))
59
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2922
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2923
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2924 def test_decode_brainix_as_jpeg(self):
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2925 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
2926
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2927 j = GetImage(_REMOTE, '/instances/%s/preview' % i)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2928 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2929 self.assertEqual(j.size[0], 256)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2930 self.assertEqual(j.size[1], 256)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2931
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2932 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
2933 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2934
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2935 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
2936 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2937
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2938 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
2939 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2940
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2941 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
2942 self.assertEqual('JPEG', j.format)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2943 self.assertEqual(j.size[0], 256)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2944 self.assertEqual(j.size[1], 256)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2945
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2946 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
2947 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
2948 self.assertLess(a, b)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2949
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2950 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
2951 self.assertEqual('JPEG', j.format)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2952
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2953 # 16bit encoding is not supported with JPEG
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2954 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
2955 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
2956
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2957 # No matching content type
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
2958 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
2959
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2960
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2961
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2962 def test_media_encodings(self):
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2963 ascii = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2964 latin1 = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2965 latin2 = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID']
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2966
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2967 tmp = DoPost(_REMOTE, '/tools/create-media', [ascii,latin1,latin2])
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2968 z = zipfile.ZipFile(StringIO(tmp), "r")
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2969
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2970 self.assertEqual(4, len(z.namelist()))
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2971 self.assertTrue('IMAGES/IM0' in z.namelist())
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2972 self.assertTrue('IMAGES/IM1' in z.namelist())
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2973 self.assertTrue('IMAGES/IM2' in z.namelist())
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2974 self.assertTrue('DICOMDIR' in z.namelist())
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2975
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2976 try:
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2977 os.remove('/tmp/DICOMDIR')
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2978 except:
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2979 # The file does not exist
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2980 pass
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2981
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2982 z.extract('DICOMDIR', '/tmp')
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2983 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ],
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2984 stderr = subprocess.STDOUT).split('\n')
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2985
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2986 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ],
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2987 stderr = subprocess.STDOUT).split('\n')
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2988 self.assertEqual(1, len(a))
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2989 self.assertEqual('', a[0])
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2990
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2991 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ])
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2992 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
2993 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
2994 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
2995
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
2996 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
2997
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
2998
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
2999 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
3000 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
3001 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
3002 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
3003
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3004 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
3005 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
3006 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
3007 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
3008
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3009 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
3010 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
3011 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
3012 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
3013
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3014 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
3015 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
3016 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
3017 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
3018
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3019 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
3020 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
3021 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
3022 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
3023
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3024 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
3025 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
3026 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
3027 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
3028
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3029 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
3030 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
3031 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
3032 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
3033 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
3034
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3035 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
3036 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
3037 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
3038 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
3039 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
3040 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
3041
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3042 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
3043 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
3044 self.assertEqual(1, len(s))
176
48cc188ffb09 strip trailing 0 char that appears with some findscu versions
am@osimis.io
parents: 175
diff changeset
3045 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
3046 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
3047 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
3048
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3049
78
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3050 def test_decode_transfer_syntax(self):
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3051 def Check(t, md5):
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3052 i = UploadInstance(_REMOTE, 'TransferSyntaxes/%s.dcm' % t)['ID']
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3053
89
74b7b9aed5f8 test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
3054 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
3055 transferSyntax = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i)
74b7b9aed5f8 test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
3056 self.assertEqual(t, transferSyntax)
74b7b9aed5f8 test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
3057
78
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3058 if md5 == None:
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3059 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
3060 else:
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3061 m = ComputeMD5(DoGet(_REMOTE, '/instances/%s/preview' % i))
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3062 self.assertEqual(m, md5)
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3063
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3064 Check('1.2.840.10008.1.2.1', 'fae08d5415c4c0cd2cdbae4522408631')
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3065 Check('1.2.840.10008.1.2.2', 'f3d9784768b8feb54d6a50b6d5c37682')
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3066 Check('1.2.840.10008.1.2.4.50', '496326046974eea718dbc16b997c646b')
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3067 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
3068 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
3069 Check('1.2.840.10008.1.2.4.70', '7132cfbc457305b04b59787030c785d2')
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3070 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
3071 Check('1.2.840.10008.1.2.4.81', '801579ae7cbf28e604ea74f2c99fa2ca')
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3072 Check('1.2.840.10008.1.2.5', '6ff51ae525d362e0d04f550a64075a0e') # RLE, supported since Orthanc 1.0.1
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3073 Check('1.2.840.10008.1.2', 'd54aed9f67a100984b42942cc2e9939b')
299
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
3074
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
3075 # JPEG2k image, not supported without GDCM plugin
304
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 302
diff changeset
3076 if not HasGdcmPlugin(_REMOTE):
299
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
3077 Check('1.2.840.10008.1.2.4.90', None)
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
3078 Check('1.2.840.10008.1.2.4.91', None)
79
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3079
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3080
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3081 def test_raw_frame(self):
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3082 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID']
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3083 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3084 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3085 self.assertEqual(512 * 512 * 2, len(a))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3086 self.assertEqual(512 * 512 * 2, len(DoGet(_REMOTE, '/instances/%s/frames/23/raw' % s)))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3087 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/raw' % s))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3088 self.assertEqual('1914287dc4d958eca21fdaacfb3482fa', ComputeMD5(a))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3089
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3090 s = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3091 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3092 self.assertEqual(186274, len(DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s)))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3093 self.assertEqual(189424, len(DoGet(_REMOTE, '/instances/%s/frames/75/raw' % s)))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3094 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/76/raw' % s))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3095 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3096 self.assertEqual("L", im.mode)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3097 self.assertEqual(512, im.size[0])
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3098 self.assertEqual(512, im.size[1])
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3099
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3100 # Test an image with 2 JPEG frames spread over multiple fragments
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3101 s = UploadInstance(_REMOTE, 'LenaTwiceWithFragments.dcm')['ID']
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3102 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3103 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3104 b = DoGet(_REMOTE, '/instances/%s/frames/1/raw' % s)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3105 self.assertEqual(69214, len(a))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3106 self.assertEqual(ComputeMD5(a), ComputeMD5(b))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3107 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/2/raw' % s))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3108 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3109 self.assertEqual("RGB", im.mode)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3110 self.assertEqual(512, im.size[0])
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3111 self.assertEqual(512, im.size[1])
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3112 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % s)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3113 self.assertEqual("RGB", im.mode)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3114 self.assertEqual(512, im.size[0])
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3115 self.assertEqual(512, im.size[1])
81
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3116
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3117
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3118
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3119 def test_rest_movescu(self):
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3120 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3121
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3122 # Upload 4 instances
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3123 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3124 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm')
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3125 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3126 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3127
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3128 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3129 for p in DoGet(_REMOTE, '/patients'):
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3130 DoPost(_REMOTE, '/modalities/orthanctest/store', p)
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3131 DoDelete(_REMOTE, '/patients/%s' % p)
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3132
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3133 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3134
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3135 # Upload instance Brainix/Flair/IM-0001-0001.dcm
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3136 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Instance',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3137 'Resources' : [
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3138 {
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3139 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3140 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3141 'SOPInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3142 }
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3143 ]})
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3144
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3145 # Upload series Brainix/Flair/*
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3146 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3147 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3148 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3149 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3150
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3151 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3152 'Resources' : [
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3153 {
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3154 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3155 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3156 }
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3157 ]})
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3158 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3159 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3160 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3161 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3162
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3163 # Upload series Brainix/Epi/*
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3164 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3165 'Resources' : [
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3166 {
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3167 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3168 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314125550',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3169 }
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3170 ]})
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3171 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3172 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3173 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3174 self.assertEqual(3, len(DoGet(_REMOTE, '/instances')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3175
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3176 # Upload study Knee/*
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3177 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Study',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3178 'Resources' : [
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3179 {
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3180 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3181 }
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3182 ]})
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3183 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3184 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3185 self.assertEqual(3, len(DoGet(_REMOTE, '/series')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3186 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3187
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3188 # Reset
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3189 for p in DoGet(_REMOTE, '/patients'):
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3190 DoDelete(_REMOTE, '/patients/%s' % p)
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3191
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3192 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3193
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3194
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3195 # Upload all at once
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3196 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Study',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3197 'Resources' : [
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3198 {
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3199 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3200 },
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3201 {
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3202 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3203 }
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3204 ]})
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3205 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3206 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3207 self.assertEqual(3, len(DoGet(_REMOTE, '/series')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3208 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3209
86
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3210
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3211
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3212 def test_reconstruct_json(self):
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3213 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3214
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3215 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3216 first = DoGet(_REMOTE, '/instances/%s/tags' % instance)
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3217
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3218 self.assertEqual('TWINOW', first['0008,1010']['Value'])
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3219 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance)))
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3220
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3221 # Cannot delete the "DICOM" attachment
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3222 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
3223
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3224 # Can delete the "DICOM as JSON" attachment
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3225 r = DoDelete(_REMOTE, '/instances/%s/attachments/dicom-as-json' % instance)
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3226 self.assertTrue(type(r) is dict and len(r) == 0)
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3227
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3228 # Only the "DICOM" attachment subsists
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3229 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance)))
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3230
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3231 # Cannot manually reconstruct the "DICOM as JSON" attachment
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3232 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
3233
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3234 # Transparently reconstruct the "DICOM as JSON" attachment
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3235 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
3236 second = DoGet(_REMOTE, '/instances/%s/tags' % instance)
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3237 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance)))
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3238
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3239 third = DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/data' % instance)
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3240 self.assertEqual(str(first), str(second))
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3241 self.assertEqual(str(first), str(third))
87
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3242
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3243
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3244 def test_reconstruct_json2(self):
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3245 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3246
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3247 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
3248 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
3249
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3250 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
3251 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
3252
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3253 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % a)))
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3254 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % b)))
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3255
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3256 DoPost(_REMOTE, '/tools/invalidate-tags', '', 'text/plain')
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3257
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3258 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % a)))
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3259 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % b)))
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3260
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3261 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
3262 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
3263
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3264 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % a)))
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3265 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % b)))
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3266
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3267
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3268 def test_private_tags(self):
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3269 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID']
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3270 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
3271 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
3272 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
3273
92
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3274
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3275 def test_findscu_encoding(self):
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3276 # Check out ../Database/Encodings/Generate.sh
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3277 TEST = u'Test-éüäöòДΘĝדصķћ๛ネİ'
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3278 ENCODINGS = {
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3279 'Arabic' : [ 'ISO_IR 127' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3280 'Ascii' : [ 'ISO_IR 6' ], # More accurately, ISO 646
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3281 'Cyrillic' : [ 'ISO_IR 144' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3282 'Greek' : [ 'ISO_IR 126' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3283 'Hebrew' : [ 'ISO_IR 138' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3284 'Japanese' : [ 'ISO_IR 13', 'shift-jis' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3285 'Latin1' : [ 'ISO_IR 100' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3286 'Latin2' : [ 'ISO_IR 101' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3287 'Latin3' : [ 'ISO_IR 109' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3288 'Latin4' : [ 'ISO_IR 110' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3289 'Latin5' : [ 'ISO_IR 148' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3290 'Thai' : [ 'ISO_IR 166', 'tis-620' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3291 'Utf8' : [ 'ISO_IR 192' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3292 }
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3293
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3294 for name in ENCODINGS.iterkeys():
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3295 if len(ENCODINGS[name]) == 1:
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3296 ENCODINGS[name].append(name.lower())
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3297
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3298 UploadInstance(_REMOTE, 'Encodings/Lena-utf8.dcm')
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3299
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3300 for name in ENCODINGS.iterkeys():
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3301 self.assertEqual(name, DoPut(_REMOTE, '/tools/default-encoding', name))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3302 self.assertEqual(name, DoGet(_REMOTE, '/tools/default-encoding'))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3303
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3304 i = CallFindScu([ '-k', '0008,0052=STUDY',
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3305 '-k', 'SpecificCharacterSet',
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3306 '-k', 'PatientName' ])
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3307
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3308 characterSet = re.findall('\(0008,0005\).*?\[(.*?)\]', i)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3309 self.assertEqual(1, len(characterSet))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3310 self.assertEqual(ENCODINGS[name][0], characterSet[0].strip())
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3311
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3312 patientName = re.findall('\(0010,0010\).*?\[(.*?)\]', i)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3313 self.assertEqual(1, len(patientName))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3314
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3315 expected = TEST.encode(ENCODINGS[name][1], 'ignore')
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3316 self.assertEqual(expected, patientName[0].strip())
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3317
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3318
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3319 #for master in ENCODINGS:
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3320 for master in [ 'Latin1', 'Utf8', 'Cyrillic' ]: # Shortcut to speedup tests
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3321 self.assertEqual(master, DoPut(_REMOTE, '/tools/default-encoding', master))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3322 self.assertEqual(master, DoGet(_REMOTE, '/tools/default-encoding'))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3323
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3324 for name in ENCODINGS:
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3325 DropOrthanc(_REMOTE)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3326 UploadInstance(_REMOTE, 'Encodings/Lena-%s.dcm' % ENCODINGS[name][1])
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3327
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3328 i = CallFindScu([ '-k', '0008,0052=STUDY',
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3329 '-k', 'PatientID',
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3330 '-k', 'SpecificCharacterSet',
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3331 '-k', 'PatientName' ])
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3332 i = i.decode(ENCODINGS[master][1])
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3333
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3334 characterSet = re.findall('\(0008,0005\).*?\[(.*?)\]', i)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3335 self.assertEqual(1, len(characterSet))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3336 self.assertEqual(ENCODINGS[master][0], characterSet[0].strip())
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3337
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3338 patientId = re.findall('\(0010,0020\).*?\[(.*?)\]', i)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3339 self.assertEqual(1, len(patientId))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3340 self.assertEqual(ENCODINGS[name][1], patientId[0].strip())
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3341
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3342 patientName = re.findall('\(0010,0010\).*?\[(.*?)\]', i)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3343 self.assertEqual(1, len(patientName))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3344
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3345 tmp = ENCODINGS[name][1]
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3346 expected = TEST.encode(tmp, 'ignore').decode(tmp)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3347 tmp = ENCODINGS[master][1]
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3348 expected = expected.encode(tmp, 'ignore').decode(tmp)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3349
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3350 self.assertEqual(expected, patientName[0].strip())
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3351
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3352
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3353 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True,
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3354 'Level' : 'Study',
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3355 'Query' : { }})
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3356 self.assertEqual(1, len(a))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3357
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3358 tmp = ENCODINGS[name][1]
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3359 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
3360
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3361
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3362 def test_reconstruct(self):
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3363 def CompareMainDicomTag(expected, instance, level, tag):
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3364 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
3365
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3366 a = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3367
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3368 studies = DoGet(_REMOTE, '/studies/')
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3369 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/')))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3370 self.assertEqual(1, len(studies))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3371 self.assertEqual(1, len(DoGet(_REMOTE, '/series/')))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3372 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/')))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3373
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3374 modified = DoPost(_REMOTE, '/studies/%s/modify' % studies[0], {
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3375 "Replace" : {
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3376 "StudyDescription" : "hello",
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3377 "SeriesDescription" : "world",
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3378 "SOPClassUID" : "test",
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3379 "SOPInstanceUID" : "myid",
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3380 },
119
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
3381 "Keep" : [ "StudyInstanceUID", "SeriesInstanceUID" ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
3382 "Force" : True
96
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3383 })
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3384
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3385 instances = DoGet(_REMOTE, '/instances/')
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3386 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/')))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3387 self.assertEqual(1, len(DoGet(_REMOTE, '/studies/')))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3388 self.assertEqual(1, len(DoGet(_REMOTE, '/series/')))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3389 self.assertEqual(2, len(instances))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3390
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3391 b = instances[0] if instances[1] == a else instances[1]
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3392
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3393 CompareMainDicomTag('Knee (R)', a, 'study', 'StudyDescription')
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3394 CompareMainDicomTag('AX. FSE PD', a, 'series', 'SeriesDescription')
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3395 CompareMainDicomTag('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a, '', 'SOPInstanceUID')
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3396 CompareMainDicomTag('myid', b, '', 'SOPInstanceUID')
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3397 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % a).strip())
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3398 self.assertEqual('test', DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % b).strip())
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3399
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3400 DoPost(_REMOTE, '/instances/%s/reconstruct' % b, {})
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3401
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3402 CompareMainDicomTag('hello', a, 'study', 'StudyDescription')
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3403 CompareMainDicomTag('world', a, 'series', 'SeriesDescription')
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3404 CompareMainDicomTag('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a, '', 'SOPInstanceUID')
102
9671578fd4d3 added tests for Lua HttpPost/Put/Get/Delete methods
amazy
parents: 100
diff changeset
3405
104
7530eb50c3c4 renamed HttpPost.lua into HttpClient.lua + fix tests
amazy
parents: 102
diff changeset
3406 def test_httpClient_lua(self):
7530eb50c3c4 renamed HttpPost.lua into HttpClient.lua + fix tests
amazy
parents: 102
diff changeset
3407 with open(GetDatabasePath('Lua/HttpClient.lua'), 'r') as f:
102
9671578fd4d3 added tests for Lua HttpPost/Put/Get/Delete methods
amazy
parents: 100
diff changeset
3408 result = DoPost(_REMOTE, '/tools/execute-script', f.read(), 'application/lua')
9671578fd4d3 added tests for Lua HttpPost/Put/Get/Delete methods
amazy
parents: 100
diff changeset
3409
9671578fd4d3 added tests for Lua HttpPost/Put/Get/Delete methods
amazy
parents: 100
diff changeset
3410 self.assertIn('OK', result)
107
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3411
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3412
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3413 def test_bitbucket_issue_44(self):
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3414 # https://bitbucket.org/sjodogne/orthanc/issues/44/bad-interpretation-of-photometric
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3415 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3416 UploadInstance(_REMOTE, 'Issue44/Monochrome2.dcm')
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3417
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3418 # dcmcjpeg +ua +eb Monochrome1.dcm Monochrome1-Jpeg.dcm
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3419 UploadInstance(_REMOTE, 'Issue44/Monochrome1-Jpeg.dcm')
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3420
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3421 # dcmcjpeg +ua Monochrome1.dcm Monochrome1-JpegLS.dcm
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3422 UploadInstance(_REMOTE, 'Issue44/Monochrome1-JpegLS.dcm')
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3423
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3424 monochrome1 = 'bcdd600a-a6a9c522-5f0a6e84-8657c9f3-b76e59b7'
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3425 monochrome1_jpeg = '9df82121-208a2da8-0038674a-3d7a773b-b7008cd2'
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3426 monochrome1_jpegls = '0486d1a2-9165573f-b1976b20-e927b016-6b8d67ab'
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3427 monochrome2 = 'f00947b7-f61f7164-c93414d1-c6fbda6a-9e92ed20'
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3428
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3429 for i in [ monochrome1, monochrome1_jpeg, monochrome1_jpegls ]:
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3430 im = GetImage(_REMOTE, '/instances/%s/preview' % i)
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3431 self.assertEqual("L", im.mode)
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3432 self.assertEqual(2010, im.size[0])
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3433 self.assertEqual(2446, im.size[1])
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3434
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3435 # 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
3436 # white (255), should be rendered as black (0) => invert
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3437 if i == monochrome1_jpeg:
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3438 # Add some tolerance because of JPEG destructive compression
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3439 self.assertGreater(10, im.getpixel((0,0)))
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3440 else:
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3441 self.assertEqual(0, im.getpixel((0,0)))
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3442
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3443 im = GetImage(_REMOTE, '/instances/%s/preview' % monochrome2)
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3444 self.assertEqual("L", im.mode)
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3445 self.assertEqual(1572, im.size[0])
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3446 self.assertEqual(2010, im.size[1])
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3447
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3448 # 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
3449 # white (255), should be rendered as white (255)
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3450 self.assertEqual(255, im.getpixel((0,0)))
111
7005cdeeb704 test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
3451
7005cdeeb704 test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
3452
7005cdeeb704 test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
3453 def test_bitbucket_issue_42(self):
7005cdeeb704 test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
3454 # https://bitbucket.org/sjodogne/orthanc/issues/42/fails-to-modify-a-dicom-video-file
123
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
3455 # 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
3456 UploadInstance(_REMOTE, 'Issue42.dcm')['ID']
7005cdeeb704 test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
3457 modified = DoPost(_REMOTE,
7005cdeeb704 test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
3458 '/patients/da128605-e040d0c4-310615d2-3475da63-df2d1ef4/modify',
119
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
3459 '{"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
3460 'application/json')
7005cdeeb704 test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
3461 self.assertTrue('PatientID' in modified)
113
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3462
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3463
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3464 def test_rest_find_limit(self):
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3465 # Check the "Since" and "Limit" parameters in URI "/tools/find"
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3466 # Related to issue 53: https://bitbucket.org/sjodogne/orthanc/issues/53
111
7005cdeeb704 test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
3467
113
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3468 # Upload 6 instances
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3469 brainix = []
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3470 knee = []
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3471 for i in range(2):
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3472 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
3473 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
3474 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
3475
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3476 # Check using BRAINIX
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3477 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3478 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3479 'Limit' : 10 })
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3480 self.assertEqual(4, len(a))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3481
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3482 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3483 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3484 'Limit' : 4 })
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3485 self.assertEqual(4, len(a))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3486
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3487 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3488 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3489 'Since' : 2,
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3490 'Limit' : 4 })
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3491 self.assertEqual(2, len(a))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3492
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3493 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3494 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3495 'Limit' : 3 })
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3496 self.assertEqual(3, len(a))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3497
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3498 b = []
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3499 for i in range(4):
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3500 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3501 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3502 'Limit' : 1,
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3503 'Since' : i })
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3504 self.assertEqual(1, len(a))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3505 b.append(a[0])
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3506
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3507 # 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
3508 self.assertEqual(0, len(set(b) ^ set(brainix)))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3509
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3510 # Check using KNEE
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3511 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3512 'Query' : { 'PatientName' : 'K*' },
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3513 'Limit' : 10 })
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3514 self.assertEqual(2, len(a))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3515
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3516 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3517 'Query' : { 'PatientName' : 'K*' },
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3518 'Limit' : 2 })
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3519 self.assertEqual(2, len(a))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3520
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3521 b = []
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3522 for i in range(2):
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3523 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3524 'Query' : { 'PatientName' : 'K*' },
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3525 'Limit' : 1,
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3526 'Since' : i })
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3527 self.assertEqual(1, len(a))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3528 b.append(a[0])
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3529
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
3530 self.assertEqual(0, len(set(b) ^ set(knee)))
115
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3531
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3532
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3533 def test_bitbucket_issue_46(self):
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3534 # "PHI remaining after anonymization"
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3535 # https://bitbucket.org/sjodogne/orthanc/issues/46
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3536
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3537 def GetAnonymizedTags(study, version):
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3538 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3539 { 'DicomVersion' : version },
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3540 'application/json') ['ID']
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3541 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3542 self.assertEqual(1, len(a))
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3543
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3544 instance = a[0]['ID']
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3545
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3546 return (instance, DoGet(_REMOTE, '/instances/%s/tags' % instance))
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3547
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3548 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3549 origStudy = '6068a14b-d4df27af-9ec22145-538772d8-74f228ff'
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3550
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3551 # 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
3552 # (Patient's Mother's Birth Name) tags
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3553 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy,
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3554 '{"Replace":{"0010,1060":"OSIMIS","0032,1033":"MOTHER"}}',
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3555 'application/json')['ID']
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3556
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3557 # 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
3558 # 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
3559 (instance, tags) = GetAnonymizedTags(newStudy, "2008")
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3560 self.assertTrue('0032,1033' in tags)
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3561 self.assertTrue('0010,1060' in tags)
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3562
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3563 # 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
3564 # 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
3565 (instance, tags) = GetAnonymizedTags(newStudy, "2017c")
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3566 self.assertFalse('0032,1033' in tags)
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3567 self.assertFalse('0010,1060' in tags)
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3568
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3569 t = {}
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3570 for (key, value) in tags.iteritems():
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3571 t[value['Name']] = value['Value']
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3572
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3573 self.assertEqual('', t['StudyDate']) # Type 1 tag => cleared
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3574 self.assertEqual('', t['StudyTime']) # Type 1 tag => cleared
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3575 self.assertEqual('', t['PatientSex']) # Type 1 tag => cleared
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3576 self.assertFalse('SeriesDate' in t) # Type 3 tag => null
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3577 self.assertFalse('SeriesTime' in t) # Type 3 tag => null
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3578
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3579 with tempfile.NamedTemporaryFile(delete = True) as f:
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3580 # 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
3581 f.write(DoGet(_REMOTE, '/instances/%s/file' % instance))
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3582 f.flush()
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3583 subprocess.check_output([ FindExecutable('dciodvfy'), f.name ],
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
3584 stderr = subprocess.STDOUT).split('\n')
118
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3585
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3586
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3587 def test_bitbucket_issue_55(self):
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3588 def Run(modify, query):
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3589 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3590
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3591 operation = 'modify' if modify else 'anonymize'
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3592
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3593 self.assertRaises(Exception, lambda: DoPost(
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3594 _REMOTE, '/studies/%s/%s' % (study, operation), query))
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3595 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3596
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3597 query["Force"] = True
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3598 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
3599 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3600 DoDelete(_REMOTE, a)
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3601
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3602 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3603
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3604 UploadInstance(_REMOTE, 'DummyCT.dcm')
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3605 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3606
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3607 Run(True, { "Replace" : { "StudyInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3608 Run(True, { "Replace" : { "SeriesInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3609 Run(True, { "Replace" : { "SOPInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3610
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3611 Run(False, { "Keep" : [ "StudyInstanceUID" ]})
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3612 Run(False, { "Keep" : [ "SeriesInstanceUID" ]})
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3613 Run(False, { "Keep" : [ "SOPInstanceUID" ]})
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3614
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3615 Run(False, { "Replace" : { "StudyInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3616 Run(False, { "Replace" : { "SeriesInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3617 Run(False, { "Replace" : { "SOPInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
3618
120
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3619
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3620 def test_bitbucket_issue_56(self):
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3621 # Case-insensitive matching over accents. This test assumes
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3622 # that the "CaseSensitivePN" configuration option of Orthanc
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3623 # is set to "false" (default value).
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3624 # https://bitbucket.org/sjodogne/orthanc/issues/56
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3625
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3626 def Check(name, expected, expectedSensitive):
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3627 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
3628 '-k', '0008,0052=PATIENT',
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3629 '-k', 'PatientName=%s' % name ])
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3630 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', a)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3631 self.assertEqual(expected, len(patientNames))
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3632
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3633 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3634 'CaseSensitive' : False,
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3635 'Query' : { 'PatientName' : name }})
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3636 self.assertEqual(expected, len(a))
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3637
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3638 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3639 'CaseSensitive' : True,
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3640 'Query' : { 'PatientName' : name }})
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3641 self.assertEqual(expectedSensitive, len(a))
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3642
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3643 UploadInstance(_REMOTE, 'Encodings/Lena-latin1.dcm')
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3644
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3645 # WildcardConstraint
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3646 Check('TeSt*', 1, 0)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3647 Check('TeSt-a*', 0, 0)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3648 Check('TeSt-É*', 1, 0)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3649 Check('TeSt-é*', 1, 0)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3650 Check('Test-é*', 1, 1)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3651
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3652 # ListConstraint
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3653 Check('Test-éüäöò\\nope', 1, 1)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3654 Check('Test-ÉÜÄÖÒ\\nope', 1, 0)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3655
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3656 # ValueConstraint
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3657 Check('Test-éüäöò', 1, 1)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3658 Check('Test-ÉÜÄÖÒ', 1, 0)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
3659
125
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
3660
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
3661 def test_gbk_alias(self):
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
3662 # https://groups.google.com/d/msg/orthanc-users/WMM8LMbjpUc/02-1f_yFCgAJ
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
3663 # This test fails on Orthanc <= 1.3.0
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
3664 i = UploadInstance(_REMOTE, '2017-09-19-GBK-Tumashu.dcm')['ID']
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
3665 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
3666 self.assertEqual(tags['PatientName'], u'徐浩凯')
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
3667 self.assertEqual(tags['InstitutionName'], u'灌云县疾病预防控制中心')
126
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3668
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3669
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3670 def test_long_tag(self):
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3671 i = UploadInstance(_REMOTE, 'DummyCTWithLongTag.dcm')['ID']
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3672 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe'
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3673
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3674 tags = DoGet(_REMOTE, '/instances/%s/tags' % i)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3675 self.assertTrue('0018,1020' in tags)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3676 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3677 self.assertEqual('TooLong', tags['0018,1020']['Type'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3678 self.assertEqual(None, tags['0018,1020']['Value'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3679
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3680 tags = DoGet(_REMOTE, '/instances/%s/tags?ignore-length=0018-1020' % i)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3681 self.assertTrue('0018,1020' in tags)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3682 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3683 self.assertEqual('String', tags['0018,1020']['Type'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3684 self.assertTrue(tags['0018,1020']['Value'].startswith('Lorem ipsum dolor sit amet'))
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3685
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3686 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3687 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3688 self.assertEqual(None, tags['SoftwareVersions'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3689 self.assertTrue('HeartRate' in tags)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3690 self.assertEqual(474, int(tags['HeartRate']))
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3691
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3692 tags = DoGet(_REMOTE, '/instances/%s/simplified-tags' % i)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3693 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3694 self.assertEqual(None, tags['SoftwareVersions'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3695
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3696 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify&ignore-length=0018-1020' % i)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3697 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3698 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet'))
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3699
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3700 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify&ignore-length=SoftwareVersions' % i)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3701 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3702 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet'))
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3703
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3704 tags = DoGet(_REMOTE, '/series/%s/instances-tags' % series)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3705 self.assertEqual(1, len(tags))
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3706 self.assertTrue(i in tags.keys())
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3707 self.assertTrue('0018,1020' in tags[i])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3708 self.assertEqual('TooLong', tags[i]['0018,1020']['Type'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3709
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3710 tags = DoGet(_REMOTE, '/series/%s/instances-tags?ignore-length=SoftwareVersions' % series)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3711 self.assertEqual(1, len(tags))
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3712 self.assertTrue(i in tags.keys())
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3713 self.assertTrue('0018,1020' in tags[i])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3714 self.assertEqual('String', tags[i]['0018,1020']['Type'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3715 self.assertTrue(tags[i]['0018,1020']['Value'].startswith('Lorem ipsum dolor sit amet'))
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
3716
127
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3717
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3718 def test_extended_media(self):
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3719 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3720
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3721 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
3722 self.assertEqual(2, len(z.namelist()))
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3723 self.assertTrue('IMAGES/IM0' in z.namelist())
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3724 self.assertTrue('DICOMDIR' in z.namelist())
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3725
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3726 try:
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3727 os.remove('/tmp/DICOMDIR')
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3728 except:
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3729 # The file does not exist
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3730 pass
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3731
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3732 z.extract('DICOMDIR', '/tmp')
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3733 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ],
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3734 stderr = subprocess.STDOUT).split('\n')
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3735 self.assertEqual(5, len(a))
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3736 self.assertTrue(a[0].startswith('Warning'))
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3737 self.assertEqual('BasicDirectory', a[1])
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3738 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
3739 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
3740 self.assertEqual('', a[4])
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3741
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3742 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ],
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3743 stderr = subprocess.STDOUT).split('\n')
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3744 self.assertEqual(1, len(a))
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3745 self.assertEqual('', a[0])
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3746
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3747 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ])
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3748 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
3749
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3750 # Check the presence of the series description (extended tag)
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3751 self.assertTrue(re.search('T1W_aTSE', a) != None)
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3752
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3753 os.remove('/tmp/DICOMDIR')
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3754
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
3755
132
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3756 def test_anonymize_relationships_1(self):
133
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3757 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3758 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
3759 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3760
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3761 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3762 '{}',
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3763 'application/json')['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3764
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3765 a = DoGet(_REMOTE, '/studies/%s/instances' % study)
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3766 self.assertEqual(2, len(a))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3767 a1 = a[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3768 a2 = a[1]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3769
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3770 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3771 self.assertEqual(2, len(b))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3772 b1 = b[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3773 b2 = b[1]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3774
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3775 SEQUENCE = '/instances/%s/content/ReferencedImageSequence'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3776 SOP = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPInstanceUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3777 CLASS = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPClassUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3778 FRAME = '/instances/%s/content/FrameOfReferenceUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3779
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3780 self.assertEqual(DoGet(_REMOTE, FRAME % a1),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3781 DoGet(_REMOTE, FRAME % a2))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3782 self.assertEqual(DoGet(_REMOTE, FRAME % b1),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3783 DoGet(_REMOTE, FRAME % b2))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3784 self.assertNotEqual(DoGet(_REMOTE, FRAME % a1),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3785 DoGet(_REMOTE, FRAME % b1))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3786 self.assertNotEqual(DoGet(_REMOTE, FRAME % a2),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3787 DoGet(_REMOTE, FRAME % b2))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3788
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3789 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
3790 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
3791 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
3792 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
3793
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3794 for i in range(3):
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3795 self.assertEqual(DoGet(_REMOTE, SOP % (a1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3796 DoGet(_REMOTE, SOP % (a2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3797 self.assertEqual(DoGet(_REMOTE, SOP % (b1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3798 DoGet(_REMOTE, SOP % (b2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3799 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3800 DoGet(_REMOTE, SOP % (b1, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3801 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3802 DoGet(_REMOTE, SOP % (b2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3803 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3804 DoGet(_REMOTE, CLASS % (b1, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3805 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3806 DoGet(_REMOTE, CLASS % (b2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3807
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3808
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3809 def test_anonymize_relationships_2(self):
133
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3810 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm')
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3811 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
3812 study = '6c65289b-db2fcb71-7eaf73f4-8e12470c-a4d6d7cf'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3813
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3814 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3815 '{}',
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3816 'application/json')['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3817
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3818 a = DoGet(_REMOTE, '/studies/%s/instances' % study)
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3819 self.assertEqual(2, len(a))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3820 a1 = a[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3821 a2 = a[1]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3822
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3823 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3824 self.assertEqual(2, len(b))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3825 b1 = b[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3826 b2 = b[1]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3827
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3828 SEQUENCE = '/instances/%s/content/SourceImageSequence'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3829 SOP = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPInstanceUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3830 CLASS = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPClassUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3831
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3832 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
3833 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
3834 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
3835 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
3836 self.assertEqual(DoGet(_REMOTE, SOP % (a1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3837 DoGet(_REMOTE, SOP % (a2, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3838 self.assertEqual(DoGet(_REMOTE, SOP % (b1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3839 DoGet(_REMOTE, SOP % (b2, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3840 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3841 DoGet(_REMOTE, SOP % (b1, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3842 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3843 DoGet(_REMOTE, SOP % (b2, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3844 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3845 DoGet(_REMOTE, CLASS % (b1, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3846 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
3847 DoGet(_REMOTE, CLASS % (b2, 0)))
133
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3848
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3849
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3850 def test_anonymize_relationships_3(self):
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3851 sr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM0')['ID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3852 mr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM631')['ID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3853 study = 'ef351eb2-c1147229-062736b8-35a151e3-e32d526b'
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3854
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3855 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3856 { "Keep" : [ "ContentSequence" ] }) ['ID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3857
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3858 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3859 self.assertEqual(2, len(a))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3860
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3861 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
3862 sr2 = a[0]['ID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3863 mr2 = a[1]['ID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3864 else:
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3865 sr2 = a[1]['ID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3866 mr2 = a[0]['ID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3867
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3868 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % sr1),
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3869 DoGet(_REMOTE, '/instances/%s/content/Modality' % sr2))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3870 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % mr1),
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3871 DoGet(_REMOTE, '/instances/%s/content/Modality' % mr2))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3872
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3873 mrUid1 = DoGet(_REMOTE, '/instances/%s' % mr1)['MainDicomTags']['SOPInstanceUID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3874 mrUid2 = DoGet(_REMOTE, '/instances/%s' % mr2)['MainDicomTags']['SOPInstanceUID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3875 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
3876 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
3877 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
3878 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
3879
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3880 PATH1 = '/instances/%s/content/CurrentRequestedProcedureEvidenceSequence'
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3881 PATH2 = PATH1 + '/0/ReferencedSeriesSequence'
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3882 PATH3 = PATH2 + '/0/ReferencedSOPSequence'
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3883 PATH4 = PATH3 + '/0/ReferencedSOPInstanceUID'
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3884 PATH5 = PATH3 + '/0/ReferencedSOPClassUID'
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3885
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3886 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr1)))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3887 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr1)))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3888 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr1)))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3889 self.assertEqual(DoGet(_REMOTE, PATH4 % sr1), mrUid1)
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3890 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
3891 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
3892
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3893 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr2)))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3894 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr2)))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3895 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr2)))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3896 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
3897
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3898 self.assertEqual(mrUid2, DoGet(_REMOTE, PATH4 % sr2).strip('\x00'))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3899 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
3900 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
3901
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3902 content1 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr1) ['ContentSequence']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3903 content2 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr2) ['ContentSequence']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
3904 self.assertEqual(str(content1), str(content2))
141
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3905
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3906
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3907 def test_bitbucket_issue_94(self):
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3908 # "a simple instance modification should not modify FrameOfReferenceUID + ..."
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3909 # https://bitbucket.org/sjodogne/orthanc/issues/94
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3910 i = UploadInstance(_REMOTE, 'Issue94.dcm')['ID']
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3911
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3912 source = DoGet(_REMOTE, '/instances/%s/attachments/dicom/data' % i)
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3913
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3914 modified = DoPost(_REMOTE, '/instances/%s/modify' % i,
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3915 { "Replace" : {"PatientID" : "toto"}, "Force": True})
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3916
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3917 anonymized = DoPost(_REMOTE, '/instances/%s/anonymize' % i)
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3918
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3919 a = ExtractDicomTags(source, [ 'FrameOfReferenceUID' ])
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3920 self.assertEqual(1, len(a))
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3921
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3922 b = ExtractDicomTags(modified, [ 'FrameOfReferenceUID' ])
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3923 self.assertEqual(1, len(b))
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3924
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3925 c = ExtractDicomTags(anonymized, [ 'FrameOfReferenceUID' ])
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3926 self.assertEqual(1, len(c))
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3927
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3928 self.assertEqual(a, b) # Modified DICOM
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
3929 self.assertNotEqual(a, c) # Anonymized DICOM
143
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3930
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3931
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3932 def test_metadata_origin(self):
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3933 # Upload using the REST API
144
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3934 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
3935 self.assertEqual('RestApi', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i))
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3936 self.assertEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i))
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3937 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i))
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3938 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/metadata/CalledAET' % i))
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3939 self.assertEqual('alice', DoGet(_REMOTE, '/instances/%s/metadata/HttpUsername' % i))
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3940
144
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3941 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i)
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3942 self.assertEqual('RestApi', m['Origin'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3943 self.assertEqual('', m['RemoteAET'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3944 self.assertNotEqual('', m['RemoteIP'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3945 self.assertFalse('CalledAET' in m)
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3946 self.assertEqual('alice', m['HttpUsername'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3947
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3948 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
3949 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
3950 self.assertEqual('1', m['IndexInSeries'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3951 self.assertTrue('ReceptionDate' in m)
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3952
143
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3953 DoDelete(_REMOTE, '/instances/%s' % i)
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3954
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3955 # Upload using the DICOM protocol
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3956 subprocess.check_call([ FindExecutable('storescu'),
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3957 _REMOTE['Server'], str(_REMOTE['DicomPort']),
144
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3958 GetDatabasePath('Knee/T1/IM-0001-0001.dcm'),
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3959 '-xw' ]) # Propose JPEG2000
143
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3960 self.assertEqual('DicomProtocol', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i))
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3961 self.assertEqual('STORESCU', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i))
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3962 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i))
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
3963 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
3964 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
3965
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3966 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i)
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3967 self.assertEqual('DicomProtocol', m['Origin'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3968 self.assertEqual('STORESCU', m['RemoteAET'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3969 self.assertNotEqual('', m['RemoteIP'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3970 self.assertEqual('ANY-SCP', m['CalledAET'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3971 self.assertFalse('HttpUsername' in m)
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3972
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3973 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
3974 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
3975 self.assertEqual('1', m['IndexInSeries'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
3976 self.assertTrue('ReceptionDate' in m)
147
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3977
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3978
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3979 def test_lua_deadlock(self):
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3980 # Rana Asim Wajid (2018-07-14): "It does seem that the issue
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3981 # is with the lua script I'm using for conversion of images to
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3982 # JPEG2000. When the script is used with 1.4.0 the first
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3983 # instance appears to be stored and then everything just
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3984 # halts, ie Orthanc wont respond to anything after that."
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3985 # https://groups.google.com/d/msg/orthanc-users/Rc-Beb42xc8/JUgdzrmCAgAJ
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
3986 InstallLuaScriptFromPath(_REMOTE, 'Lua/Jpeg2000Conversion.lua')
147
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3987
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3988 subprocess.check_call([ FindExecutable('storescu'),
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3989 _REMOTE['Server'], str(_REMOTE['DicomPort']),
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3990 GetDatabasePath('Brainix/Flair/IM-0001-0001.dcm'),
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3991 GetDatabasePath('Brainix/Flair/IM-0001-0002.dcm'),
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3992 ])
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3993
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3994 instances = DoGet(_REMOTE, '/instances')
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3995 self.assertEqual(2, len(instances))
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3996
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3997 t1 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[0])
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
3998 t2 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[1])
175
am@osimis.io
parents: 174
diff changeset
3999 self.assertEqual('1.2.840.10008.1.2.4.90', t1) # this will fail if libgdcm-tools is not installed
147
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4000 self.assertEqual(t1, t2);
154
4a533d003080 test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 147
diff changeset
4001
4a533d003080 test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 147
diff changeset
4002
4a533d003080 test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 147
diff changeset
4003 def test_find_group_length(self):
4a533d003080 test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 147
diff changeset
4004 # 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
4005 # one of the Generic Group Length tags (*, 0x0000)
4a533d003080 test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 147
diff changeset
4006 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
4007 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
4008 self.assertFalse('UnableToProcess' in result)
4a533d003080 test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 147
diff changeset
4009 self.assertFalse('E:' in result)
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4010
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4011
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4012 def test_split(self):
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4013 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4014 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
4015 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
4016 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
4017 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4018 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4019 t2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4020
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4021 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4022 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4023
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4024 info = DoGet(_REMOTE, '/studies/%s' % study)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4025 self.assertTrue('ReferringPhysicianName' in info['MainDicomTags'])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4026
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4027 job = MonitorJob2(_REMOTE, lambda: DoPost
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4028 (_REMOTE, '/studies/%s/split' % study, {
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4029 'Series' : [ t2 ],
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4030 'Replace' : { 'PatientName' : 'Hello' },
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4031 'Remove' : [ 'ReferringPhysicianName' ],
181
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
4032 'KeepSource' : False,
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
4033 'Asynchronous' : True
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4034 }))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4035
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4036 self.assertNotEqual(None, job)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4037
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4038 studies = set(DoGet(_REMOTE, '/studies'))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4039 self.assertEqual(2, len(studies))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4040
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4041 series = set(DoGet(_REMOTE, '/series'))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4042 self.assertEqual(2, len(series))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4043 self.assertTrue(t1 in series)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4044
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4045 study2 = DoGet(_REMOTE, '/jobs/%s' % job)['Content']['TargetStudy']
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4046 self.assertTrue(study in studies)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4047 self.assertTrue(study2 in studies)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4048
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4049 info = DoGet(_REMOTE, '/studies/%s' % study2)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4050 self.assertTrue('Hello', info['PatientMainDicomTags']['PatientName'])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4051 self.assertFalse('ReferringPhysicianName' in info['MainDicomTags'])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4052
254
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4053 sopInstanceUids = set()
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4054 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
4055 sopInstanceUids.add(i['MainDicomTags']['SOPInstanceUID'])
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4056
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4057 self.assertTrue(knee1Sop in sopInstanceUids)
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4058
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4059 # Fails if Orthanc <= 1.5.7
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4060 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
4061
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4062 # 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
4063 self.assertEqual(2, len(sopInstanceUids))
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4064
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4065
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4066 def test_merge(self):
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4067 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
4068 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
4069 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
4070 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
4071 knee = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4072 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4073 brainix = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988'
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4074 flair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0'
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4075
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4076 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4077 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4078
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4079 job = MonitorJob2(_REMOTE, lambda: DoPost
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4080 (_REMOTE, '/studies/%s/merge' % knee, {
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4081 'Resources' : [ brainix ],
181
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
4082 'KeepSource' : True,
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
4083 'Synchronous' : False
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4084 }))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4085
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4086 self.assertNotEqual(None, job)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4087
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4088 studies = set(DoGet(_REMOTE, '/studies'))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4089 self.assertEqual(2, len(studies))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4090 self.assertTrue(knee in studies)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4091 self.assertTrue(brainix in studies)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4092
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4093 series = set(DoGet(_REMOTE, '/studies/%s' % knee)['Series'])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4094 self.assertTrue(t1 in series)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4095 series.remove(t1)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4096 self.assertEqual(1, len(series))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4097
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4098 instances = DoGet(_REMOTE, '/series/%s' % list(series)[0])['Instances']
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4099 self.assertEqual(1, len(instances))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4100 merged = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4101
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4102 instances = DoGet(_REMOTE, '/series/%s' % t1)['Instances']
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4103 self.assertEqual(1, len(instances))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4104 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4105
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4106 instances = DoGet(_REMOTE, '/series/%s' % flair)['Instances']
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4107 self.assertEqual(1, len(instances))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4108 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4109
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4110 tags = DoGet(_REMOTE, '/studies/%s' % knee)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4111
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4112 for key in tags['PatientMainDicomTags']:
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4113 self.assertEqual(a[key], merged[key])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4114 if (key in b and key != 'PatientSex'):
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4115 self.assertNotEqual(a[key], b[key])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4116
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4117 for key in tags['MainDicomTags']:
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4118 # Not in the patient/study module
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4119 if (not key in [ 'InstitutionName',
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4120 'RequestingPhysician',
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4121 'RequestedProcedureDescription', ]):
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4122 self.assertEqual(a[key], merged[key])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4123 if (key in b):
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4124 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
4125
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4126 sopInstanceUids = set()
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4127 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
4128 sopInstanceUids.add(i['MainDicomTags']['SOPInstanceUID'])
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4129
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4130 self.assertTrue(kneeSop in sopInstanceUids)
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4131 self.assertTrue(brainixSop in sopInstanceUids)
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4132
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4133 # Fails if Orthanc <= 1.5.7
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4134 # 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
4135 self.assertEqual(3, len(sopInstanceUids))
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4136
187
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4137
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4138 def test_async_archive(self):
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4139 # Testing the asynchronous generation of archives/medias (new
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4140 # in Orthanc 1.4.3)
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4141 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4142 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4143
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4144 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4145 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4146
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4147 job = MonitorJob2(_REMOTE, lambda: DoPost
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4148 (_REMOTE, '/studies/%s/archive' % kneeT1, {
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4149 'Synchronous' : False
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4150 }))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4151
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4152 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4153 self.assertEqual(1, len(z.namelist()))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4154 self.assertFalse('DICOMDIR' in z.namelist())
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4155
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4156 job2 = MonitorJob2(_REMOTE, lambda: DoPost
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4157 (_REMOTE, '/studies/%s/media' % kneeT1, {
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4158 'Synchronous' : False
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4159 }))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4160
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4161 # The archive from the first job has been replaced by the
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4162 # archive from second job (as MediaArchiveSize == 1)
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4163 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4164
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4165 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job2)
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4166 self.assertEqual(2, len(z.namelist()))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4167 self.assertTrue('DICOMDIR' in z.namelist())
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4168
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4169 job = MonitorJob2(_REMOTE, lambda: DoPost
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4170 (_REMOTE, '/tools/create-archive', {
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4171 'Synchronous' : False,
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4172 'Resources' : [ kneeT1, kneeT2 ],
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4173 }))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4174
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4175 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4176 self.assertEqual(2, len(z.namelist()))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4177 self.assertFalse('DICOMDIR' in z.namelist())
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4178
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4179 job = MonitorJob2(_REMOTE, lambda: DoPost
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4180 (_REMOTE, '/tools/create-media', {
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4181 'Synchronous' : False,
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4182 'Resources' : [ kneeT1, kneeT2 ],
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4183 }))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4184
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4185 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4186 self.assertEqual(3, len(z.namelist()))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4187 self.assertTrue('DICOMDIR' in z.namelist())
188
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4188
187
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4189
188
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4190 def test_queries_hierarchy(self):
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4191 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
189
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4192 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
4193
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4194 tags = {
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4195 'NumberOfPatientRelatedInstances' : '',
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4196 'NumberOfPatientRelatedSeries' : '',
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4197 'NumberOfPatientRelatedStudies' : '',
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4198 'NumberOfStudyRelatedInstances' : '',
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4199 'NumberOfStudyRelatedSeries' : '',
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4200 'NumberOfSeriesRelatedInstances' : '',
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4201 }
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4202
189
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4203 tags2 = copy.copy(tags)
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4204 tags2['PatientID'] = '887' # Only consider the "Knee" patient
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4205
188
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4206 patient = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4207 'Level' : 'Patient',
189
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4208 'Query' : tags2
188
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4209 }) ['ID']
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4210
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4211 study = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4212 'Level' : 'Study',
189
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4213 'Query' : tags2
188
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4214 }) ['ID']
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4215
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4216 series = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4217 'Level' : 'Series',
189
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4218 'Query' : tags2
188
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4219 }) ['ID']
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4220
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4221 instance = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4222 'Level' : 'Instance',
189
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4223 'Query' : tags2
188
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4224 }) ['ID']
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4225
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4226 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
4227 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4228 self.assertEqual('887', p[0]['PatientID'])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4229 self.assertEqual('1', p[0]['NumberOfPatientRelatedInstances'])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4230 self.assertEqual('1', p[0]['NumberOfPatientRelatedSeries'])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4231 self.assertEqual('1', p[0]['NumberOfPatientRelatedStudies'])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4232 self.assertFalse('NumberOfStudyRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4233 self.assertFalse('NumberOfStudyRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4234 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4235
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4236 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
4237 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4238 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
4239 self.assertEqual('1', p[0]['NumberOfStudyRelatedInstances'])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4240 self.assertEqual('1', p[0]['NumberOfStudyRelatedSeries'])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4241 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4242 self.assertFalse('NumberOfPatientRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4243 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4244 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4245
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4246 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
4247 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4248 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
4249 self.assertEqual('1', p[0]['NumberOfSeriesRelatedInstances'])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4250 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4251 self.assertFalse('NumberOfPatientRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4252 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4253 self.assertFalse('NumberOfStudyRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4254 self.assertFalse('NumberOfStudyRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4255
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4256 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
4257 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4258 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
4259
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4260 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
4261 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4262 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
4263 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % study))
189
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4264
188
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4265 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
4266 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4267 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
4268 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series))
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4269
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4270 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
4271 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4272 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
4273 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance))
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4274
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4275 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
4276 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4277 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
4278 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series))
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4279
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4280 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
4281 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4282 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
4283 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance))
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4284
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4285 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
4286 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4287 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
4288 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance))
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4289
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4290
189
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4291 def test_dicom_disk_size(self):
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4292 dicomSize = 0
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4293
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4294 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4295
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4296 for i in range(2):
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4297 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
4298 UploadInstance(_REMOTE, p)
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4299 dicomSize += os.path.getsize(GetDatabasePath(p))
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4300
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4301 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
4302 self.assertEqual(2, s['CountInstances'])
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4303 self.assertEqual(2, s['CountSeries'])
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4304 self.assertEqual(1, s['CountStudies'])
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4305 self.assertEqual(dicomSize, int(s['DicomDiskSize']))
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4306 self.assertEqual(dicomSize, int(s['DicomUncompressedSize']))
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4307 self.assertLess(dicomSize, int(s['UncompressedSize']))
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4308 self.assertEqual(s['UncompressedSize'], s['DiskSize'])
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4309
202
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4310
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4311 def test_changes_2(self):
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4312 # 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
4313 # 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
4314
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4315 # 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
4316 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
4317 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
4318 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
4319 DoDelete(_REMOTE, '/instances/%s' % a)
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4320
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4321 # 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
4322 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
4323
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4324 c = DoGet(_REMOTE, '/changes')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4325 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
4326 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4327 seq = c['Last']
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4328
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4329 c = DoGet(_REMOTE, '/changes?last')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4330 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
4331 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4332 self.assertEqual(seq, c['Last'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4333
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4334 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
4335 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
4336 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4337 self.assertEqual(seq, c['Last'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4338
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4339 # Add one instance
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4340 UploadInstance(_REMOTE, 'DummyCT.dcm')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4341 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
4342
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4343 c = DoGet(_REMOTE, '/changes')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4344 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
4345 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4346 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
4347
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4348 c = DoGet(_REMOTE, '/changes?last')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4349 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
4350 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4351 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
4352
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4353 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
4354 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
4355 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4356 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
4357
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4358 # Remove the uploaded instance
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4359 DoDelete(_REMOTE, '/instances/%s' % a)
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4360 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
4361
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4362 c = DoGet(_REMOTE, '/changes')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4363 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
4364 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4365 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
4366
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4367 c = DoGet(_REMOTE, '/changes?last')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4368 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
4369 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4370 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
4371
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4372 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
4373 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
4374 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4375 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
4376
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4377
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4378 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
4379 a = UploadInstance(_REMOTE, 'Issue124.dcm')['ID']
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4380
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4381 z = GetArchive(_REMOTE, '/patients/%s/media' % a)
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4382 self.assertEqual(2, len(z.namelist()))
207
a515eec74078 test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 202
diff changeset
4383
a515eec74078 test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 202
diff changeset
4384
a515eec74078 test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 202
diff changeset
4385 def test_invalid_findscp(self):
a515eec74078 test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 202
diff changeset
4386 UploadInstance(_REMOTE, 'DummyCT.dcm')
a515eec74078 test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 202
diff changeset
4387 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
4388 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
4389
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4390
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4391 def test_bitbucket_issue_90(self):
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4392 def CountDicomResults(sex):
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4393 a = CallFindScu([ '-S', '-k', '8,52=STUDY', '-k', sex ])
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4394 return len(re.findall('\(0010,0040\)', a))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4395
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4396 def CountRestResults(sex):
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4397 a = DoPost(_REMOTE, '/tools/find',
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4398 { 'Level' : 'Study', 'Query' : { 'PatientSex' : sex } })
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4399 return len(a)
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4400
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4401 # 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
4402 # "DummyCT.dcm" has the tag PatientSex (0010,0040) unset
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4403 UploadInstance(_REMOTE, 'DummyCT.dcm')
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4404
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4405 # 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
4406
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4407 # 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
4408 self.assertEqual(0, CountDicomResults('PatientSex=*'))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4409 self.assertEqual(0, CountRestResults('*'))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4410
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4411 # 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
4412 self.assertEqual(0, CountDicomResults('PatientSex=F'))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4413 self.assertEqual(0, CountDicomResults('PatientSex=M'))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4414 self.assertEqual(0, CountRestResults('F'))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4415 self.assertEqual(0, CountRestResults('M'))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4416
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4417 # 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
4418 # 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
4419 # as a filter in such a situation.
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4420 self.assertEqual(1, CountDicomResults('PatientSex'))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4421 self.assertEqual(1, CountDicomResults('PatientSex='))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
4422 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
4423
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4424
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4425 def test_rest_modalities_in_study(self):
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4426 # 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
4427 # 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
4428 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4429
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4430 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4431 'Query' : { 'ModalitiesInStudy' : 'US' }})
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4432 self.assertEqual(0, len(a))
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4433
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4434 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4435 'Query' : { 'ModalitiesInStudy' : 'US\\CT' }})
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4436 self.assertEqual(1, len(a))
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4437
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4438 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4439 'Query' : { 'ModalitiesInStudy' : 'CT' }})
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
4440 self.assertEqual(1, len(a))
211
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4441
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4442
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4443 def test_series_status(self):
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4444 def HasCompletedInChanges():
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4445 for c in DoGet(_REMOTE, '/changes?limit=1000&since=0')['Changes']:
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4446 if c['ChangeType'] == 'CompletedSeries':
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4447 return True;
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4448
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4449 return False
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4450
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4451 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm')
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4452 series = '8ea120d7-5057d919-837dfbcc-ccd04e0f-7f3a94aa'
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4453 self.assertEqual('Unknown', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4454 self.assertFalse(HasCompletedInChanges())
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4455
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4456 series = 'ce25ecb6-ed79d004-5ae43ca7-3fc89bc5-67511614'
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4457
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4458 for i in range(3):
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4459 UploadInstance(_REMOTE, 'Series/Lena-%d.dcm' % (i + 1))
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4460 self.assertEqual('Missing', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4461 self.assertFalse(HasCompletedInChanges())
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4462
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4463 UploadInstance(_REMOTE, 'Series/Lena-4.dcm')
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4464 self.assertEqual('Complete', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4465 self.assertTrue(HasCompletedInChanges())
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4466
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4467 DoDelete(_REMOTE, '/changes')
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4468 self.assertFalse(HasCompletedInChanges())
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4469
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4470 UploadInstance(_REMOTE, 'Series/Lena-5.dcm')
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4471 self.assertEqual('Inconsistent', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4472 self.assertFalse(HasCompletedInChanges())
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
4473
215
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
4474
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
4475 def test_dicomweb(self):
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
4476 def Compare(dicom, reference):
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
4477 a = UploadInstance(_REMOTE, dicom) ['ID']
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
4478 b = DoGet(_REMOTE, '/instances/%s/file' % a,
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
4479 headers = { 'Accept' : 'application/dicom+json' })
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
4480 with open(GetDatabasePath(reference), 'rb') as c:
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
4481 d = json.load(c)
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
4482 AssertAlmostEqualRecursive(self, d, b)
215
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
4483
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
4484 Compare('DummyCT.dcm', 'DummyCT.json')
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
4485 Compare('MarekLatin2.dcm', 'MarekLatin2.json')
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
4486 Compare('HierarchicalAnonymization/StructuredReports/IM0',
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
4487 'HierarchicalAnonymization/StructuredReports/IM0.json')
217
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4488
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4489
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4490 def test_issue_95_encodings(self):
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4491 # https://bitbucket.org/sjodogne/orthanc/issues/95/server-cant-support-chinese
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4492 # Check out image: "../Database/Encodings/DavidClunie/charsettests.screenshot.png"
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4493
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4494 # Very useful tool: "file2" from package "file-kanji"
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4495
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4496 def GetPatientName(dicom):
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4497 i = UploadInstance(_REMOTE, dicom) ['ID']
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4498 j = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4499 return j['PatientName']
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4500
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4501 def ComparePatientName(name, dicom):
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4502 self.assertEqual(name, GetPatientName(dicom))
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4503
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4504 # gdcmraw -t 10,10 -i SCSFREN -o /tmp/tag && uconv -f ISO-IR-100 -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4505 ComparePatientName(u'Buc^Jérôme', 'Encodings/DavidClunie/SCSFREN')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4506
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4507 # gdcmraw -t 10,10 -i SCSI2 -o /tmp/tag && uconv -f KOREAN -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4508 ComparePatientName(u'Hong^Gildong=洪^吉洞=홍^길동', 'Encodings/DavidClunie/SCSI2') # Since Orthanc 1.5.5
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4509
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4510 # gdcmraw -t 10,10 -i SCSX2 -o /tmp/tag && uconv -f GB18030 -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4511 ComparePatientName(u'Wang^XiaoDong=王^小东=', 'Encodings/DavidClunie/SCSX2')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4512
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4513 # gdcmraw -t 10,10 -i SCSX1 -o /tmp/tag && cat /tmp/tag && echo
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4514 ComparePatientName(u'Wang^XiaoDong=王^小東=', 'Encodings/DavidClunie/SCSX1')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4515
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4516 # gdcmraw -t 10,10 -i SCSH31 -o /tmp/tag && uconv -f JIS -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4517 ComparePatientName(u'Yamada^Tarou=山田^太郎=やまだ^たろう', 'Encodings/DavidClunie/SCSH31')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4518
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4519 # gdcmraw -t 10,10 -i SCSGERM -o /tmp/tag && uconv -f ISO-IR-100 -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4520 ComparePatientName(u'Äneas^Rüdiger', 'Encodings/DavidClunie/SCSGERM')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4521
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4522 # gdcmraw -t 10,10 -i SCSGREEK -o /tmp/tag && uconv -f ISO-IR-126 -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4523 ComparePatientName(u'Διονυσιος', 'Encodings/DavidClunie/SCSGREEK')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4524
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4525 # gdcmraw -t 10,10 -i SCSRUSS -o /tmp/tag && uconv -f ISO-IR-144 -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4526 ComparePatientName(u'Люкceмбypг', 'Encodings/DavidClunie/SCSRUSS')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4527
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4528 # gdcmraw -t 10,10 -i SCSHBRW -o /tmp/tag && uconv -f ISO-IR-138 -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4529 # NB: Hebrew is a right-to-left encoding, copying/pasting from
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4530 # Linux console into Emacs automatically reverse the string
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4531 ComparePatientName(u'שרון^דבורה', 'Encodings/DavidClunie/SCSHBRW')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4532
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4533 # gdcmraw -t 10,10 -i SCSARAB -o /tmp/tag && uconv -f ISO-IR-127 -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4534 # NB: Right-to-left as for Hebrew (SCSHBRW), and the Ubuntu console can't display such
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4535 # characters by default, but copy/paste works with Emacs
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4536 ComparePatientName(u'قباني^لنزار', 'Encodings/DavidClunie/SCSARAB')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4537
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4538 # SCSH32: This SpecificCharacterSet is composed of 2
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4539 # codepages: "ISO 2022 IR 13" (i.e. "SHIFT_JIS") until the
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4540 # first equal, then "ISO 2022 IR 87" (i.e. "JIS") for the
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4541 # remainer. Orthanc only takes into consideration the first
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4542 # codepage: This is a limitation.
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4543 # gdcmraw -t 10,10 -i SCSH32 -o /tmp/tag && cut -d '=' -f 1 /tmp/tag | uconv -f SHIFT_JIS -t UTF-8
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
4544 self.assertTrue(GetPatientName('Encodings/DavidClunie/SCSH32').startswith(u'ヤマダ^タロウ='))
218
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4545
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4546
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4547 def test_findscu_missing_tags(self):
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4548 # dcmodify -e Rows DummyCTInvalidRows.dcm -gst -gse -gin
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4549 UploadInstance(_REMOTE, 'DummyCT.dcm')
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4550 UploadInstance(_REMOTE, 'DummyCTInvalidRows.dcm')
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4551
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4552 i = CallFindScu([ '-k', '0008,0052=IMAGES', '-k', 'Rows', '-k', 'PatientName' ])
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4553
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4554 # We have 2 instances...
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4555 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i)
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4556 self.assertEqual(2, len(patientNames))
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4557 self.assertEqual('KNIX', patientNames[0])
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4558 self.assertEqual('KNIX', patientNames[1])
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4559
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4560 # ...but only 1 value for the "Rows" tag
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4561 rows = re.findall('\(0028,0010\) US ([0-9]+)', i)
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4562 self.assertEqual(1, len(rows))
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
4563 self.assertEqual('512', rows[0])
219
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4564
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4565
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4566
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4567 def test_bitbucket_issue_131(self):
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4568 # "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
4569 # StudyInstanceUID in it's database."
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4570 # https://bitbucket.org/sjodogne/orthanc/issues/131/orthanc-pacs-silently-fails-to-c-move-due
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4571
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4572 # Insert 2 instances, with the same StudyInstanceUID, but with
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4573 # different patient IDs. Orthanc will create 2 distincts
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4574 # patients, and the hierarchy of resources above the two
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4575 # instances will be fully disjoint.
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4576 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-a.dcm')
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4577 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-b.dcm')
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4578
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4579 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4580 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4581
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4582 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4583 'Level' : 'Study',
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4584 'Query' : {"PatientID": "A" }})['ID']
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4585
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4586 # 1 study is matched
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4587 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
4588
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4589 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
4590 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
4591 (_REMOTE, '/queries/%s/retrieve' % a,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
4592 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4593
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4594 # 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
4595 # 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
4596 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4597
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4598
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4599 # Match the 2 studies
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4600 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4601 'Level' : 'Study',
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4602 'Query' : {"StudyInstanceUID": "2.25.123" }})['ID']
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4603 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
4604 DropOrthanc(_LOCAL)
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4605 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
4606 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
4607 (_REMOTE, '/queries/%s/retrieve' % a,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
4608 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4609 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4610
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4611
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4612 # 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
4613 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4614 'Level' : 'Patient',
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4615 'Query' : {"PatientID": "A" }})['ID']
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4616 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
4617 DropOrthanc(_LOCAL)
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4618 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
4619 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
4620 (_REMOTE, '/queries/%s/retrieve' % a,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
4621 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4622 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4623
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4624
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4625 # 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
4626 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4627 'Level' : 'Series',
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4628 'Query' : {"PatientID": "A" }})['ID']
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4629 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
4630 DropOrthanc(_LOCAL)
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4631 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
4632 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
4633 (_REMOTE, '/queries/%s/retrieve' % a,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
4634 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4635 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
4636
233
ce0b19a2c807 test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 231
diff changeset
4637
ce0b19a2c807 test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 231
diff changeset
4638 def test_bitbucket_issue_136(self):
ce0b19a2c807 test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 231
diff changeset
4639 UploadInstance(_REMOTE, 'Issue137.dcm')
ce0b19a2c807 test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 231
diff changeset
4640 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
4641 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i)
ce0b19a2c807 test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 231
diff changeset
4642 self.assertEqual(1, len(patientNames))
ce0b19a2c807 test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 231
diff changeset
4643 self.assertEqual('John Doe', patientNames[0])
234
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4644
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4645
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4646 def test_anonymize_relationships_4(self):
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4647 # 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
4648 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
4649 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
4650 study = '0c923249-d52121a9-2b7167f7-6b85534f-0943697e'
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4651
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4652 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, '{}',
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4653 'application/json')['ID']
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4654 series = DoGet(_REMOTE, '/studies/%s/series' % anonymized)
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4655 self.assertEqual(2, len(series))
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4656
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4657 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
4658 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
4659 self.assertEqual(1, len(cr))
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4660 self.assertEqual(1, len(pr))
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4661 self.assertEqual(1, len(cr[0]['Instances']))
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4662 self.assertEqual(1, len(pr[0]['Instances']))
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4663
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4664 crinstance = DoGet(_REMOTE, '/instances/%s' % cr[0]['Instances'][0])
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4665 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
4666
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4667 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
4668 crinstance['MainDicomTags']['SOPInstanceUID'])
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4669 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
4670 '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
4671
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4672 # This fails on Orthanc <= 1.5.6
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4673 self.assertEqual(tags['0008,1115'][0]['0020,000e'],
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
4674 cr[0]['MainDicomTags']['SeriesInstanceUID'])
235
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4675
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4676
255
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4677 def test_anonymize_relationships_5(self):
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4678 ct1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/CT01.dcm')
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4679 rt1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/RT.dcm')
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4680 oStudyId = ct1['ParentStudy']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4681 oCtInstanceId = ct1['ID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4682 oRtInstanceId = rt1['ID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4683
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4684 oCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oCtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4685 oRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oRtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4686
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4687 # first validate the relationships in the source data
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4688 oStudyUID = oCtTags['StudyInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4689 oRtSeriesUID = oRtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4690 oRtInstanceUID = oRtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4691 oRtFrameOfReferenceUID = oRtTags['ReferencedFrameOfReferenceSequence'][0]['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4692 oCtSeriesUID = oCtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4693 oCtInstanceUID = oCtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4694 oCtFrameOfReferenceUID = oCtTags['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4695
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4696 oContourSequenceCount = len(oRtTags['ROIContourSequence'][0]['ContourSequence'])
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4697 self.assertEqual(oCtFrameOfReferenceUID, oRtFrameOfReferenceUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4698 self.assertEqual(oStudyUID, oRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID'])
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4699 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
4700 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
4701 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
4702
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4703 ### anonymize
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4704
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4705 aStudyId = DoPost(_REMOTE, '/studies/%s/anonymize' % oStudyId, '{}',
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4706 'application/json')['ID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4707
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4708 ### validate
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4709
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4710 aSeries = DoGet(_REMOTE, '/studies/%s/series' % aStudyId)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4711 self.assertEqual(2, len(aSeries))
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4712
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4713 aCt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CT', aSeries))
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4714 aRt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'RTSTRUCT', aSeries))
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4715 aCtInstanceId = aCt[0]['Instances'][0]
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4716 aRtInstanceId = aRt[0]['Instances'][0]
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4717 aCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aCtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4718 aRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aRtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4719
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4720 # now validate the relationships in the anonymized data
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4721 aStudyUID = aCtTags['StudyInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4722 aRtSeriesUID = aRtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4723 aRtInstanceUID = aRtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4724 aRtFrameOfReferenceUID = aRtTags['ReferencedFrameOfReferenceSequence'][0]['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4725 aCtSeriesUID = aCtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4726 aCtInstanceUID = aCtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4727 aCtFrameOfReferenceUID = aCtTags['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4728
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4729 aContourSequenceCount = len(aRtTags['ROIContourSequence'][0]['ContourSequence'])
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4730 # make sure all UIDs have been updated
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4731 self.assertNotEqual(oStudyUID, aStudyUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4732 self.assertNotEqual(oRtSeriesUID, aRtSeriesUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4733 self.assertNotEqual(oRtInstanceUID, aRtInstanceUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4734 self.assertNotEqual(oRtFrameOfReferenceUID, aRtFrameOfReferenceUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4735 self.assertNotEqual(oCtSeriesUID, aCtSeriesUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4736 self.assertNotEqual(oCtInstanceUID, aCtInstanceUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4737 self.assertNotEqual(oCtFrameOfReferenceUID, aCtFrameOfReferenceUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4738
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4739 # validate the relationships
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4740 self.assertEqual(oContourSequenceCount, aContourSequenceCount)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4741 self.assertEqual(aCtFrameOfReferenceUID, aRtFrameOfReferenceUID)
256
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4742 self.assertEqual(aStudyUID, aRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID'])
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4743 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
4744 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
4745 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
4746
256
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4747 def test_anonymize_relationships_5b(self):
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4748 # same test as previous one but, this time, we force the StudyInstanceUID
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4749 ct1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/CT01.dcm')
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4750 rt1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/RT.dcm')
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4751 oStudyId = ct1['ParentStudy']
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4752 oCtInstanceId = ct1['ID']
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4753 oRtInstanceId = rt1['ID']
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4754
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4755 oCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oCtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4756 oRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oRtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4757
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4758 ### anonymize while forcing the StudyInstanceUID
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4759
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4760 aStudyId = DoPost(_REMOTE, '/studies/%s/anonymize' % oStudyId, '{ "Replace" : { "StudyInstanceUID" : "1.2.3.4"}, "Force": true}',
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4761 'application/json')['ID']
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4762
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4763 ### validate
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4764
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4765 aSeries = DoGet(_REMOTE, '/studies/%s/series' % aStudyId)
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4766 self.assertEqual(2, len(aSeries))
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4767
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4768 aCt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CT', aSeries))
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4769 aRt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'RTSTRUCT', aSeries))
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4770 aCtInstanceId = aCt[0]['Instances'][0]
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4771 aRtInstanceId = aRt[0]['Instances'][0]
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4772 aCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aCtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4773 aRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aRtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4774
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4775 self.assertEqual("1.2.3.4", aCtTags['StudyInstanceUID'])
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4776 self.assertEqual("1.2.3.4", aRtTags['StudyInstanceUID'])
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
4777 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
4778
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
4779
235
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4780 def test_bitbucket_issue_140(self):
266
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
4781 # "Modifying private tags with REST API changes VR from LO to
267
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 266
diff changeset
4782 # UN." This test fails if DCMTK <= 3.6.1 (e.g. fails on Ubuntu 16.04).
266
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
4783 # https://bitbucket.org/sjodogne/orthanc/issues/140
235
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4784 source = UploadInstance(_REMOTE, 'Issue140.dcm') ['ID']
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4785 series = DoGet(_REMOTE, '/instances/%s' % source) ['ParentSeries']
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4786
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4787 target = DoPost(_REMOTE, '/series/%s/modify' % series, {
266
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
4788 'Replace' : { 'RadioButton3' : 'aaabbbccc' },
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
4789 'PrivateCreator' : 'RadioLogic', # <= the trick is here
235
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4790 }, 'application/json') ['ID']
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4791
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4792 instances = DoGet(_REMOTE, '/series/%s/instances' % target)
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4793 self.assertEqual(1, len(instances))
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4794
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4795 tags = DoGet(_REMOTE, '/instances/%s/tags' % source)
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4796 t = tags['4321,1012']
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4797 self.assertEqual('String', t['Type'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4798 self.assertEqual('RadioButton3', t['Name'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4799 self.assertEqual('RadioLogic', t['PrivateCreator'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4800 self.assertEqual('jklmopq', t['Value'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4801
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4802 tags = DoGet(_REMOTE, '/instances/%s/tags' % instances[0]['ID'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4803 t = tags['4321,1012']
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4804 self.assertEqual('String', t['Type'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4805 self.assertEqual('RadioButton3', t['Name'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4806 self.assertEqual('RadioLogic', t['PrivateCreator'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
4807 self.assertEqual('aaabbbccc', t['Value'])
236
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4808
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4809
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4810 def test_find_normalize(self):
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4811 # https://groups.google.com/d/msg/orthanc-users/AIwooGjsh94/YL28MNY4AgAJ
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4812
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4813 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4814
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4815 a = DoPost(_REMOTE, '/modalities/self/query', {
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4816 'Level' : 'Instance',
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4817 'Query' : { 'Rows' : '42' }
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4818 }) ['ID']
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4819
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4820 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a)
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4821 self.assertEqual(1, len(b))
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4822 self.assertFalse('Rows' in b[0])
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4823
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4824 a = DoPost(_REMOTE, '/modalities/self/query', {
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4825 'Level' : 'Instance',
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4826 'Query' : { 'Rows' : '42' },
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4827 'Normalize' : False
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4828 }) ['ID']
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4829
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4830 b = DoGet(_REMOTE, '/queries/%s/answers' % a)
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4831 self.assertEqual(0, len(b))
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4832
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4833 a = DoPost(_REMOTE, '/modalities/self/query', {
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4834 'Level' : 'Instance',
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4835 'Query' : { 'Rows' : '512' },
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4836 'Normalize' : False
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4837 }) ['ID']
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4838
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4839 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a)
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4840 self.assertEqual(1, len(b))
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4841 self.assertTrue('Rows' in b[0])
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
4842 self.assertEqual('512', b[0]['Rows'])
237
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4843
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4844 a = DoPost(_REMOTE, '/modalities/self/query', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4845 'Level' : 'Instance',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4846 'Query' : { 'Rows' : '' },
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4847 'Normalize' : False
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4848 }) ['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4849
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4850 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4851 self.assertEqual(1, len(b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4852 self.assertTrue('Rows' in b[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4853 self.assertEqual('512', b[0]['Rows'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4854
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4855 self.assertRaises(Exception, lambda: DoPost(
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4856 _REMOTE, '/modalities/self/query', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4857 'Level' : 'Instance',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4858 'Query' : { 'Rows' : '*' }, # Out-of-range value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4859 'Normalize' : False
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
4860 }))
243
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4861
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4862
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4863 def test_bitbucket_issue_141(self):
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4864 # https://bitbucket.org/sjodogne/orthanc/issues/141/
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4865 a = UploadInstance(_REMOTE, 'Issue141.dcm') ['ID']
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4866 study = '494c8037-b237f263-d8f15075-c8cb2280-daf39bd1'
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4867
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4868 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f:
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4869 pdf = f.read()
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4870
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4871 b = DoPost(_REMOTE, '/tools/create-dicom', {
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4872 'Parent' : study,
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4873 'Tags' : {},
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4874 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4875 }) ['ID']
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4876
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4877 tagsA = DoGet(_REMOTE, '/instances/%s/tags?short' % a)
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4878 tagsB = DoGet(_REMOTE, '/instances/%s/tags?short' % b)
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4879 self.assertEqual(tagsA['0008,0005'], tagsB['0008,0005'])
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
4880 self.assertEqual(tagsA['0008,1030'], tagsB['0008,1030'])
247
1abdab0ba0e6 test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 243
diff changeset
4881
1abdab0ba0e6 test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 243
diff changeset
4882
1abdab0ba0e6 test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 243
diff changeset
4883 def test_modifying_missing_patientid(self):
1abdab0ba0e6 test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 243
diff changeset
4884 # 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
4885 UploadInstance(_REMOTE, '2019-06-17-VedranZdesic.dcm')
1abdab0ba0e6 test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 243
diff changeset
4886 DoPost(_REMOTE, '/studies/0c4aca1d-c107a241-6659d6aa-594c674a-a468b94a/modify', {})
262
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4887
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4888
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4889 def test_log_level(self):
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4890 # https://bitbucket.org/sjodogne/orthanc/issues/65/
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4891 original = DoGet(_REMOTE, '/tools/log-level')
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4892
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4893 DoPut(_REMOTE, '/tools/log-level', 'default')
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4894 self.assertEqual('default', DoGet(_REMOTE, '/tools/log-level'))
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4895 DoGet(_REMOTE, '/system')
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4896
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4897 DoPut(_REMOTE, '/tools/log-level', 'verbose')
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4898 self.assertEqual('verbose', DoGet(_REMOTE, '/tools/log-level'))
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4899 DoGet(_REMOTE, '/system')
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4900
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4901 DoPut(_REMOTE, '/tools/log-level', 'trace')
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4902 self.assertEqual('trace', DoGet(_REMOTE, '/tools/log-level'))
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4903 DoGet(_REMOTE, '/system')
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4904
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4905 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/log-level', 'nope'))
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4906
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4907 # Switch back to the original log level
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4908 DoPut(_REMOTE, '/tools/log-level', original)
264
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
4909
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
4910
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
4911 def test_upload_compressed(self):
265
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
4912 # New in Orthanc 1.6.0
264
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
4913 with open(GetDatabasePath('DummyCT.dcm.gz'), 'rb') as f:
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
4914 d = f.read()
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
4915
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
4916 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances', d, 'application/dicom'))
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
4917
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
4918 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances', d, 'application/dicom',
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
4919 headers = { 'Content-Encoding' : 'nope' }))
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
4920
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
4921 a = DoPost(_REMOTE, '/instances', d, 'application/dicom',
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
4922 headers = { 'Content-Encoding' : 'gzip' })
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
4923 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a['ID'])
262
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4924
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
4925
263
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4926 def test_study_series_find_inconsistency(self):
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4927 # 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
4928
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4929 def CountAnswers(query):
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4930 a = DoPost(_REMOTE, 'modalities/self/query', query)
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4931 return len(DoGet(_REMOTE, '%s/answers' % a['Path']))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4932
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4933 # 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
4934 # "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
4935 # the "main DICOM tags" of Orthanc.
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4936 UploadInstance(_REMOTE, 'Issue137.dcm')
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4937
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4938
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4939 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4940 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4941 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4942
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4943 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4944 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4945 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4946
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4947
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4948 ##
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4949 ## "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
4950 ## 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
4951 ##
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4952
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4953 # 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
4954 # is wiped out by the normalization
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4955 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4956 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4957 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4958 'SeriesDescription' : 'NOPE'
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4959 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4960 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4961 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4962 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4963 # This test fails on Orthanc <= 1.5.8
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4964 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4965 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4966 'SeriesDescription' : '*' # Wildcard matching => no match, as the tag is absent
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4967 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4968 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4969 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4970 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4971 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4972 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4973 'SeriesDescription' : 'THIS^VALUE^IS^WIPED^OUT'
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4974 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4975 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4976 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4977 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4978 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4979 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4980 'SeriesDescription' : '*' # Matches, as wiped out by the normalization
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4981 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4982 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4983 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4984
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4985 for normalize in [ True, False ]:
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4986 # 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
4987 # normalization has no effect
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4988
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4989 # "Universal matching" will match all entities, including
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4990 # those with the missing tag
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4991 # 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
4992 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4993 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4994 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4995 'SeriesDescription' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4996 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4997 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4998 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
4999 # "Universal matching" will match all entities, including
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5000 # those with the missing tag
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5001 # 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
5002 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5003 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5004 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5005 'SeriesDescription' : '*' # Wildcard matching
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5006 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5007 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5008 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5009 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5010 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5011 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5012 '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
5013 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5014 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5015 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5016 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5017 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5018 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5019 'SeriesDescription' : '*MISMATCHED^VALUE*'
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5020 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5021 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5022 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5023
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5024 # Universal matching matches any instance, even if the
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5025 # 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
5026 # makes no sense
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5027 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5028 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5029 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5030 'SeriesDescription' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5031 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5032 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5033 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5034
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5035
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5036
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5037 ##
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5038 ## "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
5039 ##
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5040
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5041 # 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
5042 # is wiped out by the normalization
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5043 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5044 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5045 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5046 'ProtocolName' : 'NOPE'
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5047 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5048 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5049 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5050 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5051 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5052 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5053 '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
5054 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5055 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5056 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5057 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5058 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5059 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5060 'ProtocolName' : 'THIS^VALUE^IS^WIPED^OUT'
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5061 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5062 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5063 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5064 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5065 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5066 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5067 'ProtocolName' : '*' # Matches, as wiped out by the normalization
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5068 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5069 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5070 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5071
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5072 for normalize in [ True, False ]:
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5073 # 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
5074 # normalization has no effect
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5075
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5076 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5077 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5078 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5079 'ProtocolName' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5080 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5081 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5082 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5083 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5084 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5085 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5086 '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
5087 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5088 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5089 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5090 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5091 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5092 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5093 'ProtocolName' : '*MISMATCHED^VALUE*'
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5094 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5095 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5096 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5097
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5098 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5099 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5100 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5101 'ProtocolName' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5102 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5103 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5104 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5105
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5106
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5107 ##
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5108 ## "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
5109 ##
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5110
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5111 for level in [ 'Study', 'Series' ] :
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5112 for normalize in [ True, False ]:
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5113 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5114 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5115 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5116 'StudyInstanceUID' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5117 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5118 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5119 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5120 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5121 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5122 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5123 'StudyInstanceUID' : 'MISMATCHED^VALUE'
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5124 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5125 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5126 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5127 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5128 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5129 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5130 '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
5131 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5132 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5133 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5134
269
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
5135 # 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
5136 # This test fails on Orthanc <= 1.5.8
269
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
5137 self.assertRaises(Exception, lambda: CountAnswers({
263
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5138 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5139 'Query' : {
269
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
5140 'StudyInstanceUID' : '*'
263
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5141 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5142 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5143 }))
265
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5144
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5145
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5146 def test_rendered(self):
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5147 # New in Orthanc 1.6.0
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5148 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID']
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5149 im = GetImage(_REMOTE, '/instances/%s/rendered' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5150 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5151 self.assertEqual(41, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5152 self.assertEqual(41, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5153
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5154 # http://effbot.org/zone/pil-comparing-images.htm
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5155 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png'))
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5156 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5157
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5158 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5159 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5160 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5161 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5162
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5163 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5164 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5165 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5166 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5167
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5168 im = GetImage(_REMOTE, '/instances/%s/rendered?height=128' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5169 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5170 self.assertEqual(128, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5171 self.assertEqual(128, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5172
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5173 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10&smooth=0' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5174 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5175 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5176 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5177
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5178 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10&smooth=1' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5179 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5180 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5181 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5182
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5183 im = GetImage(_REMOTE, '/instances/%s/rendered?height=5&width=10' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5184 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5185 self.assertEqual(5, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5186 self.assertEqual(5, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5187
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5188
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5189 # Grayscale image
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5190 i = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5191 im = GetImage(_REMOTE, '/instances/%s/rendered' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5192 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5193 self.assertEqual(288, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5194 self.assertEqual(288, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5195 self.assertEqual(0, im.getpixel((0, 0)))
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5196
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5197 # Those are the original windowing parameters that are written
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5198 # inside the DICOM file
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5199 im2 = GetImage(_REMOTE, '/instances/%s/rendered?window-center=248.009544468547&window-width=431.351843817788' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5200 self.assertEqual("L", im2.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5201 self.assertEqual(288, im2.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5202 self.assertEqual(288, im2.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5203 self.assertTrue(ImageChops.difference(im, im2).getbbox() is None)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5204
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5205 im = GetImage(_REMOTE, '/instances/%s/rendered?width=512&smooth=0' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5206 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5207 self.assertEqual(512, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5208 self.assertEqual(512, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5209
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5210 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&smooth=0' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5211 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5212 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5213 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5214
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5215 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&smooth=1' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5216 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5217 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5218 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5219
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5220 im = GetImage(_REMOTE, '/instances/%s/rendered?width=1&window-center=-1000' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5221 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5222 self.assertEqual(1, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5223 self.assertEqual(1, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5224 self.assertEqual(255, im.getpixel((0, 0)))
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5225
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5226 im = GetImage(_REMOTE, '/instances/%s/rendered?width=1&window-center=1000' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5227 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5228 self.assertEqual(1, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5229 self.assertEqual(1, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5230 self.assertEqual(0, im.getpixel((0, 0)))
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5231
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5232
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5233 # Test monochrome 1
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5234 i = UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')['ID']
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5235 im = GetImage(_REMOTE, '/instances/%s/rendered' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5236 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5237 self.assertEqual(2010, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5238 self.assertEqual(2446, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5239 self.assertEqual(0, im.getpixel((0, 0)))
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5240 im = GetImage(_REMOTE, '/instances/%s/rendered?width=20' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5241 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5242 self.assertEqual(20, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5243 self.assertEqual(24, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5244 im = GetImage(_REMOTE, '/instances/%s/rendered?height=24' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5245 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5246 self.assertEqual(20, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5247 self.assertEqual(24, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5248 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&height=24' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5249 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5250 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5251 self.assertEqual(12, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5252 im = GetImage(_REMOTE, '/instances/%s/rendered?width=40&height=24' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5253 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5254 self.assertEqual(20, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5255 self.assertEqual(24, im.size[1])
268
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5256
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5257
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5258 def test_bitbucket_issue_154(self):
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5259 # "Matching against list of UID-s by C-MOVE"
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5260 # https://bitbucket.org/sjodogne/orthanc/issues/154/
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5261 a = UploadInstance(_REMOTE, 'Issue154-d1.dcm') ['ID']
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5262 b = UploadInstance(_REMOTE, 'Issue154-d2.dcm') ['ID']
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5263
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5264 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
5265 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
5266 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
5267
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5268 # C-FIND is working on list of UIDs
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5269 i = CallFindScu([ '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5270 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5271 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2) ])
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5272 series = re.findall('\(0020,000e\).*?\[(.*?)\]', i)
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5273 self.assertEqual(2, len(series))
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5274 self.assertTrue(series1 in series)
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5275 self.assertTrue(series2 in series)
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5276
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5277 # Individual retrieval is working in Orthanc < 1.6.0
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5278 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5279 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5280 '--study', '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5281 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5282 '-k', 'SeriesInstanceUID=%s' % series1,
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5283 ])))
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5284 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5285 '--study', '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5286 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5287 '-k', 'SeriesInstanceUID=%s' % series2,
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5288 ])))
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5289 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5290
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5291 DropOrthanc(_LOCAL)
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5292
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5293 # 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
5294 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5295 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5296 '--study', '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5297 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5298 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2),
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5299 ])))
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5300 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5301
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5302
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5303 def test_storage_commitment_api(self):
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5304 # 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
5305
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5306 def WaitTransaction(uid):
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5307 while True:
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5308 s = DoGet(_REMOTE, '/storage-commitment/%s' % uid)
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5309 if s['Status'] != 'Pending':
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5310 return s
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5311 else:
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5312 time.sleep(0.1)
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5313
281
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5314 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5315 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
5316 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
5317
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5318 # Against self
281
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5319 transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5320 "DicomInstances" : [ [ sopClassUid, sopInstanceUid ] ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5321 }) ['ID']
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5322 self.assertTrue(transaction.startswith('2.25.'))
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5323
280
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5324 result = WaitTransaction(transaction)
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5325 self.assertEqual('ORTHANC', result['RemoteAET'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5326 self.assertEqual('Success', result['Status'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5327 self.assertEqual(1, len(result['Success']))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5328 self.assertEqual(0, len(result['Failures']))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5329 self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5330 self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5331
281
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5332 tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5333 "DicomInstances" : [
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5334 { 'SOPClassUID' : sopClassUid,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5335 'SOPInstanceUID' : sopInstanceUid },
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5336 ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5337 })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5338 self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5339 self.assertEqual(result, WaitTransaction(transaction))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5340
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5341 tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5342 "Resources" : [
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5343 instance['ID'],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5344 instance['ParentSeries'],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5345 instance['ParentStudy'],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5346 instance['ParentPatient'],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5347 ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5348 })
280
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5349 self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5350 self.assertEqual(result, WaitTransaction(transaction))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5351
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5352
281
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5353 transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5354 "DicomInstances" : [
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5355 [ 'nope', 'nope2' ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5356 [ sopClassUid, sopInstanceUid ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5357 ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5358 }) ['ID']
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5359 self.assertTrue(transaction.startswith('2.25.'))
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5360
280
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5361 result = WaitTransaction(transaction)
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5362 self.assertEqual('ORTHANC', result['RemoteAET'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5363 self.assertEqual('Failure', result['Status'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5364 self.assertEqual(1, len(result['Success']))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5365 self.assertEqual(1, len(result['Failures']))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5366 self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5367 self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5368 self.assertEqual('nope', result['Failures'][0]['SOPClassUID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5369 self.assertEqual('nope2', result['Failures'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5370 self.assertEqual(274, result['Failures'][0]['FailureReason'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5371
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5372 # Cannot remove items from a failed storage commitment transaction
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5373 self.assertRaises(Exception, lambda:
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5374 DoPost(_REMOTE, '/storage-commitment/%s/remove' % transaction))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5375
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5376
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5377 # Against Orthanc 0.8.6, that does not support storage commitment
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5378 self.assertRaises(Exception, lambda:
281
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5379 DoPost(_REMOTE, '/modalities/orthanctest/storage-commitment', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5380 "DicomInstances" : [
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5381 [ sopClassUid, sopInstanceUid ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5382 ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5383 }))
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5384
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5385
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5386
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5387 def test_storage_commitment_store(self):
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5388 # 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
5389
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5390 def WaitTransaction(uid):
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5391 while True:
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5392 s = DoGet(_REMOTE, '/storage-commitment/%s' % uid)
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5393 if s['Status'] != 'Pending':
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5394 return s
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5395 else:
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5396 time.sleep(0.1)
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5397
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5398 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5399 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5400 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5401
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5402 # The Orthanc 0.8.6 from "_LOCAL" does not support storage commitment
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5403 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/modalities/orthanctest/store', {
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5404 'Resources' : [ i ],
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5405 'StorageCommitment' : True,
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5406 }))
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5407
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5408 j = DoPost(_REMOTE, '/modalities/orthanctest/store', {
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5409 'Resources' : [ i ],
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5410 'StorageCommitment' : False,
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5411 })
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5412 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5413
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5414 j = DoPost(_REMOTE, '/modalities/self/store', {
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5415 'Resources' : [ i ],
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5416 'StorageCommitment' : True,
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5417 })
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5418
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5419 transaction = j['StorageCommitmentTransactionUID']
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5420 self.assertTrue(transaction.startswith('2.25.'))
280
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5421
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5422 result = WaitTransaction(transaction)
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5423 self.assertEqual('ORTHANC', result['RemoteAET'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5424 self.assertEqual('Success', result['Status'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5425 self.assertEqual(1, len(result['Success']))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5426 self.assertEqual(0, len(result['Failures']))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5427 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
5428 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
5429 result['Success'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5430
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5431 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5432 DoPost(_REMOTE, '/storage-commitment/%s/remove' % transaction)
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5433 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
285
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5434
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5435
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5436 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
5437 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5438 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5439
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5440 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5441 dicom = f.read()
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5442
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5443 self.assertRaises(Exception, lambda: DoPost(
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5444 _REMOTE, '/modalities/orthanctest/store-straight', 'nope', 'nope'))
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5445
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5446 answer = DoPost(_REMOTE, '/modalities/orthanctest/store-straight', dicom, 'nope')
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5447
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5448 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
5449 answer['SOPClassUID'])
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5450 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
5451 answer['SOPInstanceUID'])
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5452
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5453 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
5454 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
289
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5455
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5456
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5457 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
5458 # Add a RLE-encoded DICOM file
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5459 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
5460 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5461 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5462 rleSize = len(DoGet(_REMOTE, '/instances/%s/file' % i))
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5463
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5464 # Export the instance, with transcoding: "_REMOTE" is the
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5465 # Orthanc server being tested
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5466 try:
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5467 DoDelete(_REMOTE, '/modalities/toto')
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5468 except:
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5469 pass
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5470
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5471 params = DoGet(_REMOTE, '/modalities?expand') ['orthanctest']
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5472 DoPut(_REMOTE, '/modalities/toto', params)
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5473 DoPost(_REMOTE, '/modalities/toto/store', str(i), 'text/plain')
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5474 j = DoGet(_LOCAL, '/instances')
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5475 self.assertEqual(1, len(j))
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5476 uncompressedSize = len(DoGet(_LOCAL, '/instances/%s/file' % j[0]))
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5477 self.assertTrue(uncompressedSize > rleSize / 2)
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5478
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5479 # Export, with transcoding disabled => this fails
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5480 params['AllowTranscoding'] = False
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5481 DoPut(_REMOTE, '/modalities/toto', params)
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
5482 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/modalities/toto/store', str(i), 'text/plain'))
290
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5483
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5484
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5485 def test_bitbucket_issue_169(self):
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5486 with open(GetDatabasePath('Issue169.dcm.bz2'), 'rb') as f:
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5487 dicom = bz2.decompress(f.read())
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5488
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5489 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
5490
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5491 self.assertEqual(44350560, len(dicom))
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5492 i = DoPost(_REMOTE, '/instances', dicom, 'application/dicom') ['ID']
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5493
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5494 tags = DoGet(_REMOTE, '/instances/%s/tags' % i)
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5495 self.assertEqual('NORMAL', tags['1337,1001']['Value'])
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5496
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5497 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5498 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5499 j = DoGet(_LOCAL, '/instances')
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5500 self.assertEqual(1, len(j))
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5501
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5502 # 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
5503 # 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
5504 # Little Endian" (1.2.840.10008.1.2)
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
5505 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
5506 DoGet(_LOCAL, '/instances/%s/file' % j[0])))
290
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5507
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5508 # 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
5509 # because of this transcoding
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5510 tags = DoGet(_LOCAL, '/instances/%s/tags' % j[0])
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
5511 self.assertEqual('NORMAL', tags['1337,1001']['Value'])
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
5512
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
5513
302
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5514 def test_modify_transcode_instance(self):
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
5515 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
5516 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
5517 DoGet(_REMOTE, '/instances/%s/file' % i)))
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
5518
299
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5519 a = ExtractDicomTags(DoGet(_REMOTE, '/instances/%s/file' % i), [ 'SOPInstanceUID' ]) [0]
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5520 self.assertTrue(len(a) > 20)
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5521
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5522 SYNTAXES = [
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5523 '1.2.840.10008.1.2',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5524 '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
5525 #'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
5526 '1.2.840.10008.1.2.2',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5527 '1.2.840.10008.1.2.4.50',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5528 '1.2.840.10008.1.2.4.51',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5529 '1.2.840.10008.1.2.4.57',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5530 '1.2.840.10008.1.2.4.70',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5531 ]
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5532
304
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 302
diff changeset
5533 if HasGdcmPlugin(_REMOTE):
299
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5534 SYNTAXES = SYNTAXES + [
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5535 '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
5536 '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
5537 '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
5538 '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
5539 ]
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5540
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5541 for syntax in SYNTAXES:
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
5542 transcoded = DoPost(_REMOTE, '/instances/%s/modify' % i, {
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
5543 'Transcode' : syntax,
299
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5544 'Keep' : [ 'SOPInstanceUID' ],
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5545 'Force' : True,
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
5546 })
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
5547
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
5548 self.assertEqual(syntax, GetTransferSyntax(transcoded))
292
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5549
299
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5550 b = ExtractDicomTags(transcoded, [ 'SOPInstanceUID' ]) [0]
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5551 self.assertTrue(len(b) > 20)
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5552 if syntax in [ '1.2.840.10008.1.2.4.50',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5553 '1.2.840.10008.1.2.4.51',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5554 '1.2.840.10008.1.2.4.81',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5555 '1.2.840.10008.1.2.4.91' ]:
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5556 # Lossy transcoding: The SOP instance UID must have changed
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5557 self.assertNotEqual(a, b)
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5558 else:
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
5559 self.assertEqual(a, b)
292
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5560
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5561 def test_archive_transcode(self):
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5562 info = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5563
293
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5564 # GET on "/media"
292
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5565 z = GetArchive(_REMOTE, '/patients/%s/media' % info['ParentPatient'])
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5566 self.assertEqual(2, len(z.namelist()))
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5567 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
5568
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5569 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
5570
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5571 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
5572 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
5573
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5574 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
5575 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
5576
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5577 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
5578 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
5579
293
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5580
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5581 # POST on "/media"
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5582 self.assertRaises(Exception, lambda: PostArchive(
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5583 _REMOTE, '/patients/%s/media' % info['ParentPatient'], { 'Transcode' : 'nope' }))
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5584
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5585 z = PostArchive(_REMOTE, '/patients/%s/media' % info['ParentPatient'], {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5586 'Transcode' : '1.2.840.10008.1.2.4.50',
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5587 })
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5588 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
5589
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5590 z = PostArchive(_REMOTE, '/studies/%s/media' % info['ParentStudy'], {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5591 'Transcode' : '1.2.840.10008.1.2.4.51',
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5592 })
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5593 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
5594
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5595 z = PostArchive(_REMOTE, '/series/%s/media' % info['ParentSeries'], {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5596 'Transcode' : '1.2.840.10008.1.2.4.57',
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5597 })
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5598 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
5599
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5600
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5601 # GET on "/archive"
292
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5602 z = GetArchive(_REMOTE, '/patients/%s/archive' % info['ParentPatient'])
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5603 self.assertEqual(1, len(z.namelist()))
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5604 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
5605
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5606 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
5607
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5608 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
5609 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
5610
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5611 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
5612 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
5613
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
5614 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
5615 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
5616
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5617
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5618 # POST on "/archive"
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5619 self.assertRaises(Exception, lambda: PostArchive(
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5620 _REMOTE, '/patients/%s/archive' % info['ParentPatient'], { 'Transcode' : 'nope' }))
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5621
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5622 z = PostArchive(_REMOTE, '/patients/%s/archive' % info['ParentPatient'], {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5623 'Transcode' : '1.2.840.10008.1.2.4.50',
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5624 })
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5625 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
5626
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5627 z = PostArchive(_REMOTE, '/studies/%s/archive' % info['ParentStudy'], {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5628 'Transcode' : '1.2.840.10008.1.2.4.51',
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5629 })
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5630 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
5631
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5632 z = PostArchive(_REMOTE, '/series/%s/archive' % info['ParentSeries'], {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5633 'Transcode' : '1.2.840.10008.1.2.4.57',
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5634 })
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5635 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
5636
293
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5637
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5638 # "/tools/create-*"
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5639 z = PostArchive(_REMOTE, '/tools/create-archive', {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5640 'Resources' : [ info['ParentStudy'] ],
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5641 'Transcode' : '1.2.840.10008.1.2.4.50',
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5642 })
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5643 self.assertEqual(1, len(z.namelist()))
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5644 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
5645
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5646 z = PostArchive(_REMOTE, '/tools/create-media', {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5647 'Resources' : [ info['ParentStudy'] ],
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5648 'Transcode' : '1.2.840.10008.1.2.4.51',
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5649 })
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5650 self.assertEqual(2, len(z.namelist()))
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5651 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
5652
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5653 z = PostArchive(_REMOTE, '/tools/create-media-extended', {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5654 'Resources' : [ info['ParentStudy'] ],
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5655 'Transcode' : '1.2.840.10008.1.2.4.57',
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5656 })
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5657 self.assertEqual(2, len(z.namelist()))
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5658 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
5659
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
5660
301
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5661 def test_modify_keep_source(self):
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5662 # 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
5663 i = UploadInstance(_REMOTE, 'DummyCT.dcm')
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5664 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5665
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5666 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], {
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5667 'Replace' : {
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5668 'StationName' : 'TEST',
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5669 },
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5670 'KeepSource' : True,
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5671 })
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5672
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5673 s = DoGet(_REMOTE, '/studies')
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5674 self.assertEqual(2, len(s))
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5675 self.assertTrue(i['ParentStudy'] in s)
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5676 self.assertTrue(j['ID'] in s)
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5677
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5678 DoDelete(_REMOTE, '/studies/%s' % j['ID'])
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5679 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5680
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5681 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], {
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5682 'Replace' : {
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5683 'StationName' : 'TEST',
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5684 },
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5685 'KeepSource' : False,
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5686 })
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5687
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5688 s = DoGet(_REMOTE, '/studies')
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5689 self.assertEqual(1, len(s))
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5690 self.assertFalse(i['ParentStudy'] in s)
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
5691 self.assertTrue(j['ID'] in s)
302
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5692
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5693
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5694 def test_modify_transcode_study(self):
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5695 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5696 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
5697 DoGet(_REMOTE, '/instances/%s/file' % i['ID'])))
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5698
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5699 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5700 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], {
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5701 'Transcode' : '1.2.840.10008.1.2.4.50',
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5702 'KeepSource' : False
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5703 })
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5704
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5705 k = DoGet(_REMOTE, '/instances')
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5706 self.assertEqual(1, len(k))
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5707 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
5708 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
5709 DoGet(_REMOTE, '/instances/%s/file' % k[0])))
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
5710
305
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5711
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5712 def test_store_peer_transcoding(self):
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5713 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5714
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5715 SYNTAXES = [
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5716 '1.2.840.10008.1.2',
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5717 '1.2.840.10008.1.2.1',
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5718 #'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
5719 '1.2.840.10008.1.2.2',
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5720 '1.2.840.10008.1.2.4.50',
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5721 '1.2.840.10008.1.2.4.51',
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5722 '1.2.840.10008.1.2.4.57',
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5723 '1.2.840.10008.1.2.4.70',
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5724 ]
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5725
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5726 if HasGdcmPlugin(_REMOTE):
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5727 SYNTAXES = SYNTAXES + [
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5728 '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
5729 '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
5730 '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
5731 '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
5732 ]
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5733
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5734 for syntax in SYNTAXES:
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5735 body = {
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5736 'Resources' : [ i ],
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5737 }
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5738
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5739 if syntax != '1.2.840.10008.1.2.1':
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5740 body['Transcode'] = syntax
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5741
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5742 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5743 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5744 DoPost(_REMOTE, '/peers/peer/store', body, 'text/plain')
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5745 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5746 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5747 self.assertEqual(syntax, GetTransferSyntax(
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5748 DoGet(_LOCAL, '/instances/%s/file' % DoGet(_LOCAL, '/instances') [0])))
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5749
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
5750 DropOrthanc(_LOCAL)