Mercurial > hg > orthanc-tests
annotate Tests/Tests.py @ 220:7b1c976caa9b Orthanc-1.5.5
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 25 Feb 2019 10:57:28 +0100 |
| parents | 00e5aeea33dd |
| children | 4087505ddfe3 |
| rev | line source |
|---|---|
| 22 | 1 #!/usr/bin/env python |
| 2 # -*- coding: utf-8 -*- | |
| 3 | |
| 4 | |
| 3 | 5 # Orthanc - A Lightweight, RESTful DICOM Store |
| 73 | 6 # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
| 3 | 7 # Department, University Hospital of Liege, Belgium |
| 195 | 8 # Copyright (C) 2017-2019 Osimis S.A., Belgium |
| 3 | 9 # |
| 10 # This program is free software: you can redistribute it and/or | |
| 11 # modify it under the terms of the GNU General Public License as | |
| 12 # published by the Free Software Foundation, either version 3 of the | |
| 13 # License, or (at your option) any later version. | |
| 14 # | |
| 15 # This program is distributed in the hope that it will be useful, but | |
| 16 # WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 18 # General Public License for more details. | |
| 19 # | |
| 20 # You should have received a copy of the GNU General Public License | |
| 21 # along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 22 | |
| 23 | |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
24 import base64 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
25 import copy |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
26 import pprint |
| 14 | 27 import tempfile |
| 3 | 28 import unittest |
| 29 | |
| 11 | 30 from PIL import ImageChops |
| 3 | 31 from Toolbox import * |
| 13 | 32 from xml.dom import minidom |
| 3 | 33 |
| 34 _LOCAL = None | |
| 35 _REMOTE = None | |
| 36 | |
| 37 | |
| 38 def SetOrthancParameters(local, remote): | |
| 39 global _LOCAL, _REMOTE | |
| 40 _LOCAL = local | |
| 41 _REMOTE = remote | |
| 42 | |
| 43 | |
| 14 | 44 def ExtractDicomTags(rawDicom, tags): |
| 45 with tempfile.NamedTemporaryFile(delete = True) as f: | |
| 46 f.write(rawDicom) | |
| 47 f.flush() | |
| 45 | 48 data = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ]) |
| 14 | 49 |
| 50 result = [] | |
| 51 for tag in tags: | |
| 52 match = re.search('<element[^>]+name="%s">([^>]*)</element>' % tag, data) | |
| 53 if match == None: | |
| 54 result.append('') | |
| 55 else: | |
| 56 result.append(match.group(1)) | |
| 57 | |
| 58 return result | |
| 59 | |
| 60 | |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
61 def CompareLists(a, b): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
62 if len(a) != len(b): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
63 return False |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
64 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
65 for i in range(len(a)): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
66 d = a[i] - b[i] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
67 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
|
68 return False |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
69 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
70 return True |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
71 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
72 |
|
80
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
73 def CompareTags(a, b, tagsToIgnore): |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
74 for i in tagsToIgnore: |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
75 if i in a: |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
76 del a[i] |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
77 if i in b: |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
78 del b[i] |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
79 |
| 123 | 80 if a.keys() == b.keys(): |
| 81 return True | |
| 82 else: | |
| 83 print('Mismatch in tags: %s' % str(set(a.keys()) ^ set(b.keys()))) | |
| 84 return False | |
|
80
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
85 |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
86 |
|
71
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
87 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
|
88 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
|
89 '-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
|
90 _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
|
91 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
|
92 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
|
93 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
94 |
| 142 | 95 def GetMoveScuCommand(): |
| 96 return [ | |
| 97 FindExecutable('movescu'), | |
| 98 '--move', _LOCAL['DicomAet'], # Target AET (i.e. storescp) | |
| 99 '--call', _REMOTE['DicomAet'], # Called AET (i.e. Orthanc) | |
| 100 '--aetitle', _LOCAL['DicomAet'], # Calling AET (i.e. storescp) | |
| 101 _REMOTE['Server'], | |
| 102 str(_REMOTE['DicomPort']) | |
| 103 ] | |
| 104 | |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
105 def CallMoveScu(args): |
| 142 | 106 subprocess.check_call(GetMoveScuCommand() + args, |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
107 stderr=subprocess.PIPE) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
108 |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
109 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
110 |
|
51
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
111 def GenerateTestSequence(): |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
112 return [ |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
113 { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
114 'StudyDescription': 'Hello^', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
115 'ReferencedStudySequence' : [ |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
116 { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
117 'StudyDescription': 'Toto', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
118 }, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
119 { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
120 'StudyDescription': 'Tata', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
121 }, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
122 ] |
|
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 { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
125 'StudyDescription': 'Sébastien^', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
126 'StudyDate' : '19700202', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
127 } |
|
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 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
131 |
| 15 | 132 |
| 3 | 133 class Orthanc(unittest.TestCase): |
| 134 def setUp(self): | |
| 83 | 135 if (sys.version_info >= (3, 0)): |
| 136 # Remove annoying warnings about unclosed socket in Python 3 | |
| 137 import warnings | |
| 138 warnings.simplefilter("ignore", ResourceWarning) | |
| 139 | |
| 3 | 140 DropOrthanc(_LOCAL) |
| 141 DropOrthanc(_REMOTE) | |
| 174 | 142 UninstallLuaCallbacks(_REMOTE) |
| 45 | 143 #print "In test", self._testMethodName |
|
44
ffa542cce638
Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
144 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
145 def AssertSameImages(self, truth, url): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
146 im = GetImage(_REMOTE, url) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
147 self.assertTrue(CompareLists(truth, im.getdata())) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
148 |
| 3 | 149 |
| 150 def test_system(self): | |
| 177 | 151 self.assertTrue('Version' in DoGet(_REMOTE, '/system')) |
| 152 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 153 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 154 | |
| 155 systemInfo = DoGet(_REMOTE, '/system') | |
| 156 if systemInfo["Version"] == "mainline": | |
| 157 print "Skipping version checks since you're currently in mainline" | |
| 158 return | |
| 159 | |
| 173 | 160 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 8, 6)) |
| 161 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 8, 7)) | |
| 162 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 7, 6)) | |
| 163 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 9, 6)) | |
| 164 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 1, 8, 6)) | |
| 3 | 165 |
| 166 def test_upload(self): | |
| 173 | 167 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) |
| 168 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 169 | |
| 170 sizeDummyCT = 2472 | |
| 171 sizeOverwrite = 2476 | |
| 172 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d' | |
| 173 | |
| 3 | 174 u = UploadInstance(_REMOTE, 'DummyCT.dcm') |
| 183 | 175 self.assertEqual(instance, u['ID']) |
| 3 | 176 self.assertEqual('Success', u['Status']) |
| 173 | 177 |
| 183 | 178 if True: |
| 179 # New test for Orthanc 1.4.3 | |
| 180 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', u['ParentSeries']) | |
| 181 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', u['ParentStudy']) | |
| 182 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', u['ParentPatient']) | |
| 183 | |
| 173 | 184 j = int(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % instance)) |
| 185 s = sizeDummyCT + j | |
| 186 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 187 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 188 | |
| 3 | 189 u = UploadInstance(_REMOTE, 'DummyCT.dcm') |
| 190 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 191 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 192 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 193 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 173 | 194 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalDiskSize']) |
| 195 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 196 | |
| 197 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance) | |
| 3 | 198 self.assertEqual('20070101', i['StudyDate']) |
| 173 | 199 self.assertEqual('KNIX', i['PatientName']) |
| 200 | |
| 201 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2): | |
| 202 # Overwriting | |
| 203 self.assertEqual('Success', u['Status']) | |
| 204 else: | |
| 205 self.assertEqual('AlreadyStored', u['Status']) | |
| 206 | |
| 207 u = UploadInstance(_REMOTE, 'DummyCT-overwrite.dcm') | |
| 208 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 209 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 210 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 211 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 212 | |
| 213 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2): | |
| 214 # Overwriting | |
| 215 self.assertEqual('Success', u['Status']) | |
| 216 j2 = int(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % instance)) | |
| 217 s2 = sizeOverwrite + j2 | |
| 218 self.assertNotEqual(s, s2) | |
| 219 self.assertNotEqual(j, j2) | |
| 220 self.assertEqual('%d' % s2, DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 221 self.assertEqual('%d' % s2, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 222 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance) | |
| 223 self.assertEqual('ANOTHER', i['PatientName']) | |
| 224 else: | |
| 225 self.assertEqual('AlreadyStored', u['Status']) | |
| 226 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 227 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 3 | 228 |
| 5 | 229 def test_upload_2(self): |
| 3 | 230 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
| 231 instance = DoGet(_REMOTE, '/instances/%s' % i) | |
| 232 self.assertEqual(i, instance['ID']) | |
| 233 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', | |
| 234 instance['MainDicomTags']['SOPInstanceUID']) | |
| 235 | |
| 236 series = DoGet(_REMOTE, '/series/%s' % instance['ParentSeries']) | |
| 237 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 238 series['MainDicomTags']['SeriesInstanceUID']) | |
| 239 | |
| 240 study = DoGet(_REMOTE, '/studies/%s' % series['ParentStudy']) | |
| 241 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 242 study['MainDicomTags']['StudyInstanceUID']) | |
| 243 | |
| 244 patient = DoGet(_REMOTE, '/patients/%s' % study['ParentPatient']) | |
| 245 self.assertEqual('ozp00SjY2xG', | |
| 246 patient['MainDicomTags']['PatientID']) | |
| 247 | |
| 248 dicom = DoGet(_REMOTE, '/instances/%s/file' % instance['ID']) | |
| 249 self.assertEqual(2472, len(dicom)) | |
| 250 self.assertEqual('3e29b869978b6db4886355a2b1132124', ComputeMD5(dicom)) | |
| 251 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 252 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/simplified-tags' % i)['StationName']) | |
| 253 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
|
254 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
|
255 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/tags?short' % i)['0008,1010']) |
| 3 | 256 |
| 257 | |
| 5 | 258 def test_images(self): |
| 259 i = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID'] | |
| 260 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 3 | 261 |
| 5 | 262 im = GetImage(_REMOTE, '/instances/%s/preview' % i) |
| 263 self.assertEqual("L", im.mode) | |
| 264 self.assertEqual(512, im.size[0]) | |
| 265 self.assertEqual(358, im.size[1]) | |
| 266 | |
| 267 im = GetImage(_REMOTE, '/instances/%s/image-uint8' % i) | |
| 268 self.assertEqual("L", im.mode) | |
| 269 self.assertEqual(512, im.size[0]) | |
| 270 self.assertEqual(358, im.size[1]) | |
| 271 | |
| 272 im = GetImage(_REMOTE, '/instances/%s/image-uint16' % i) | |
| 273 self.assertEqual(512, im.size[0]) | |
| 274 self.assertEqual(358, im.size[1]) | |
| 275 | |
| 276 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i) | |
| 277 self.assertEqual("L", im.mode) | |
| 278 self.assertEqual(512, im.size[0]) | |
| 279 self.assertEqual(358, im.size[1]) | |
| 280 | |
| 281 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint8' % i) | |
| 282 self.assertEqual("L", im.mode) | |
| 283 self.assertEqual(512, im.size[0]) | |
| 284 self.assertEqual(358, im.size[1]) | |
| 285 | |
| 286 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint16' % i) | |
| 287 self.assertEqual(512, im.size[0]) | |
| 288 self.assertEqual(358, im.size[1]) | |
| 64 | 289 |
| 290 # This is Little Endian Explicit | |
| 291 self.assertEqual('1.2.840.10008.1.2.1', DoGet(_REMOTE, '/instances/%s/header?simplify' % i)['TransferSyntaxUID']) | |
| 292 | |
| 6 | 293 |
| 294 def test_hierarchy(self): | |
| 295 UploadFolder(_REMOTE, 'Brainix/Epi') | |
| 296 UploadFolder(_REMOTE, 'Brainix/Flair') | |
| 297 UploadFolder(_REMOTE, 'Knee/T1') | |
| 298 UploadFolder(_REMOTE, 'Knee/T2') | |
| 299 | |
| 300 p = DoGet(_REMOTE, '/patients') | |
| 301 s = DoGet(_REMOTE, '/studies') | |
| 302 t = DoGet(_REMOTE, '/series') | |
| 303 self.assertEqual(2, len(p)) | |
| 304 self.assertEqual(2, len(s)) | |
| 305 self.assertEqual(4, len(t)) | |
| 306 self.assertEqual(94, len(DoGet(_REMOTE, '/instances'))) | |
| 307 | |
| 308 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0' | |
| 309 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' | |
| 310 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8' | |
| 311 brainixFlair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' | |
| 312 | |
| 313 kneePatient = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' | |
| 314 kneeStudy = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' | |
| 315 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' | |
| 316 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' | |
| 317 | |
| 318 self.assertTrue(brainixPatient in p) | |
| 319 self.assertTrue(kneePatient in p) | |
| 320 self.assertTrue(brainixStudy in s) | |
| 321 self.assertTrue(kneeStudy in s) | |
| 322 self.assertTrue(brainixEpi in t) | |
| 323 self.assertTrue(brainixFlair in t) | |
| 324 self.assertTrue(kneeT1 in t) | |
| 325 self.assertTrue(kneeT2 in t) | |
| 326 | |
| 327 self.assertEqual(44, len(DoGet(_REMOTE, '/patients/%s/instances' % brainixPatient))) | |
| 328 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % brainixPatient))) | |
| 329 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % brainixPatient))) | |
| 330 | |
| 331 self.assertEqual(50, len(DoGet(_REMOTE, '/patients/%s/instances' % kneePatient))) | |
| 332 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % kneePatient))) | |
| 333 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % kneePatient))) | |
| 334 | |
| 335 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % brainixStudy))) | |
| 336 self.assertEqual(44, len(DoGet(_REMOTE, '/studies/%s/instances' % brainixStudy))) | |
| 337 | |
| 338 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % kneeStudy))) | |
| 339 self.assertEqual(50, len(DoGet(_REMOTE, '/studies/%s/instances' % kneeStudy))) | |
| 340 | |
| 341 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixEpi))) | |
| 342 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixFlair))) | |
| 343 self.assertEqual(24, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT1))) | |
| 344 self.assertEqual(26, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT2))) | |
| 345 | |
| 346 for patient in p: | |
| 347 for study in DoGet(_REMOTE, '/patients/%s/studies' % patient): | |
| 348 self.assertEqual(patient, study['ParentPatient']) | |
| 349 for series in DoGet(_REMOTE, '/studies/%s/series' % study['ID']): | |
| 350 self.assertEqual(study['ID'], series['ParentStudy']) | |
| 211 | 351 self.assertEqual('Unknown', series['Status']) |
| 6 | 352 for instance in DoGet(_REMOTE, '/series/%s/instances' % series['ID']): |
| 353 self.assertEqual(series['ID'], instance['ParentSeries']) | |
| 354 | |
| 355 self.assertEqual(json.dumps(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/data' % instance['ID'])), | |
| 356 json.dumps(DoGet(_REMOTE, '/instances/%s/tags' % instance['ID']))) | |
| 357 | |
| 358 | |
| 359 r = DoDelete(_REMOTE, "/studies/%s" % brainixStudy)['RemainingAncestor'] | |
| 360 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 361 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 362 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 363 self.assertEqual(50, len(DoGet(_REMOTE, '/instances'))) | |
| 364 self.assertEqual(None, r) | |
| 365 | |
| 366 r = DoDelete(_REMOTE, "/series/%s" % kneeT2)['RemainingAncestor'] | |
| 367 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 368 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 369 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 370 self.assertEqual(24, len(DoGet(_REMOTE, '/instances'))) | |
| 371 self.assertEqual('Study', r['Type']) | |
| 372 self.assertEqual(kneeStudy, r['ID']) | |
| 373 | |
| 374 r = DoDelete(_REMOTE, "/instances/%s" % DoGet(_REMOTE, '/instances')[0])['RemainingAncestor'] | |
| 375 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 376 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 377 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 378 self.assertEqual(23, len(DoGet(_REMOTE, '/instances'))) | |
| 379 self.assertEqual('Series', r['Type']) | |
| 380 self.assertEqual(kneeT1, r['ID']) | |
| 381 | |
| 382 r = DoDelete(_REMOTE, "/patients/%s" % kneePatient)['RemainingAncestor'] | |
| 383 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 384 self.assertEqual(0, len(DoGet(_REMOTE, '/studies'))) | |
| 385 self.assertEqual(0, len(DoGet(_REMOTE, '/series'))) | |
| 386 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 387 self.assertEqual(None, r) | |
| 388 | |
| 389 DropOrthanc(_REMOTE) | |
| 390 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 391 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 7 | 392 |
|
213
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
393 def test_delete_cascade(self): |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
394 # 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
|
395 |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
396 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
|
397 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
|
398 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
|
399 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
|
400 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
|
401 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
|
402 |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
403 DoDelete(_REMOTE, '/instances/%s' % a) |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
404 |
|
eba6b8c38eee
added a delete_cascade test to reproduce an issue in our MSSQL plugin
amazy
parents:
211
diff
changeset
|
405 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
|
406 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
|
407 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
|
408 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
|
409 |
| 7 | 410 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
411 def test_multiframe(self): |
| 7 | 412 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] |
| 413 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 414 | |
| 415 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i) | |
| 416 self.assertEqual("L", im.mode) | |
| 417 self.assertEqual(512, im.size[0]) | |
| 418 self.assertEqual(512, im.size[1]) | |
| 419 | |
| 420 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint8' % i) | |
| 421 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint16' % i) | |
| 422 DoGet(_REMOTE, '/instances/%s/frames/75/preview' % i) | |
| 423 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/aaa/preview' % i)) | |
| 424 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/76/preview' % i)) | |
| 425 | |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
426 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
427 def test_changes(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
428 # Check emptiness |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
429 c = DoGet(_REMOTE, '/changes') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
430 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
|
431 #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
|
432 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
433 c = DoGet(_REMOTE, '/changes?last') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
434 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
|
435 #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
|
436 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
437 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
438 # Add 1 instance |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
439 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
|
440 c = DoGet(_REMOTE, '/changes') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
441 begin = c['Last'] |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
442 self.assertEqual(4, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
443 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
444 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
|
445 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
446 c = DoGet(_REMOTE, '/changes?last') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
447 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
448 self.assertEqual(begin, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
449 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
450 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
|
451 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
452 self.assertEqual(begin, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
453 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
454 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
|
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 - 1, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
457 self.assertFalse(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 - 3)) |
|
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 - 2, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
461 self.assertFalse(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
462 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
463 UploadFolder(_REMOTE, 'Knee/T1') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
464 UploadFolder(_REMOTE, 'Knee/T2') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
465 since = begin |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
466 countPatients = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
467 countStudies = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
468 countSeries = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
469 countInstances = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
470 completed = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
471 while True: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
472 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
|
473 since = c['Last'] |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
474 for i in c['Changes']: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
475 if i['ResourceType'] == 'Instance': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
476 countInstances += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
477 if i['ResourceType'] == 'Patient': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
478 countPatients += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
479 if i['ResourceType'] == 'Study': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
480 countStudies += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
481 if i['ResourceType'] == 'Series': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
482 countSeries += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
483 if i['ChangeType'] == 'NewInstance': |
|
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['ChangeType'] == 'NewPatient': |
|
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['ChangeType'] == 'NewStudy': |
|
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['ChangeType'] == 'NewSeries': |
|
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'] == 'CompletedSeries': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
492 completed += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
493 self.assertTrue('ID' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
494 self.assertTrue('Path' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
495 self.assertTrue('Seq' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
496 if c['Done']: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
497 break |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
498 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
499 self.assertEqual(2 * 50, countInstances) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
500 self.assertEqual(2 * 1, countPatients) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
501 self.assertEqual(2 * 1, countStudies) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
502 self.assertEqual(2 * 2, countSeries) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
503 self.assertEqual(0, completed) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
504 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
505 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
506 def test_archive(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
507 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
|
508 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') |
| 192 | 509 knee = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' |
| 510 | |
| 511 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
|
512 self.assertEqual(2, len(z.namelist())) |
|
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 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
|
515 self.assertEqual(2, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
516 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
517 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
|
518 self.assertEqual(1, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
519 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
520 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') |
| 192 | 521 brainix = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0' |
| 522 | |
| 523 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
|
524 self.assertEqual(2, len(z.namelist())) |
| 192 | 525 |
| 526 z = PostArchive(_REMOTE, '/tools/create-archive', { | |
| 527 'Resources' : [ brainix, knee ] | |
| 528 }) | |
| 529 self.assertEqual(3, len(z.namelist())) | |
| 530 | |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
531 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
532 def test_media_archive(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
533 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
|
534 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
|
535 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
536 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
|
537 self.assertEqual(3, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
538 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
|
539 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
|
540 self.assertTrue('DICOMDIR' in z.namelist()) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
541 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
542 try: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
543 os.remove('/tmp/DICOMDIR') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
544 except: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
545 # The file does not exist |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
546 pass |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
547 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
548 z.extract('DICOMDIR', '/tmp') |
| 45 | 549 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
|
550 stderr = subprocess.STDOUT).split('\n') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
551 self.assertEqual(3, len(a)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
552 self.assertTrue(a[0].startswith('Warning')) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
553 self.assertEqual('BasicDirectory', a[1]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
554 self.assertEqual('', a[2]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
555 |
| 45 | 556 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
|
557 stderr = subprocess.STDOUT).split('\n') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
558 self.assertEqual(1, len(a)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
559 self.assertEqual('', a[0]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
560 |
| 45 | 561 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
|
562 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
|
563 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
|
564 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
565 os.remove('/tmp/DICOMDIR') |
| 10 | 566 |
| 567 | |
| 568 def test_protection(self): | |
| 569 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 570 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 571 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 572 a = DoGet(_REMOTE, '/patients')[0] | |
| 573 b = DoGet(_REMOTE, '/patients')[1] | |
| 574 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 575 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain') | |
| 576 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 577 DoPut(_REMOTE, '/patients/%s/protected' % a, '1', 'text/plain') | |
| 578 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 579 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain') | |
| 580 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 581 | |
| 582 | |
| 12 | 583 def test_raw_tags(self): |
| 10 | 584 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] |
| 585 | |
| 586 dicom = DoGet(_REMOTE, '/instances/%s/file' % i) | |
| 587 self.assertEqual('1a7c56cb02d6e742cc9c856a8ac182e3', ComputeMD5(dicom)) | |
| 588 | |
| 589 s = '/instances/%s/content/' % i | |
| 590 | |
| 591 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, s + '0008-1010').strip()) | |
| 592 self.assertRaises(Exception, lambda: DoGet(_REMOTE, s + '0008-1011')) | |
| 593 | |
| 594 self.assertEqual('Abdomen', DoGet(_REMOTE, s + '7fe1-1001/0/7fe1-1008/0/7fe1-1057').strip()) | |
| 595 self.assertEqual('cla_3c', DoGet(_REMOTE, s + '7fe1-1001/0/7fe1-1008/8/7fe1-1057').strip()) | |
| 596 | |
| 597 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 598 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 599 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 600 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 601 | |
| 602 for i in DoGet(_REMOTE, '/instances'): | |
| 603 aid = DoGet(_REMOTE, '/instances/%s' % i)['MainDicomTags']['SOPInstanceUID'] | |
| 604 self.assertEqual(aid, DoGet(_REMOTE, '/instances/%s/content/0008-0018' % i).replace(chr(0), '')) | |
| 605 | |
| 606 | |
| 607 def test_raw_tags_mdn(self): | |
| 608 # Bug reported by Cyril Paulus | |
| 609 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] | |
| 610 self.assertAlmostEqual(0.000027, DoGet(_REMOTE, '/instances/%s/content/7053-1000' % i)) | |
| 611 | |
| 612 | |
| 613 def test_modify_instance(self): | |
| 614 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] | |
| 615 modified = DoPost(_REMOTE, '/instances/%s/modify' % i, | |
| 616 json.dumps({ | |
| 617 "Replace" : { | |
| 618 "PatientName" : "hello", | |
| 619 #"PatientID" : "world" | |
| 620 }, | |
| 621 "Remove" : [ "StationName" ], | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
622 "RemovePrivateTags" : True |
| 10 | 623 }), |
| 624 'application/json') | |
| 625 j = DoPost(_REMOTE, '/instances', modified, 'application/dicom')['ID'] | |
| 626 | |
| 627 self.assertNotEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 628 #self.assertNotEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % i).strip()) | |
| 83 | 629 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i).strip()) |
| 10 | 630 DoGet(_REMOTE, '/instances/%s/content/6003-1010' % i) # Some private tag |
| 631 | |
| 632 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 633 #self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % j).strip()) | |
| 634 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j)) | |
| 635 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/6003-1010' % j)) | |
| 636 | |
| 637 | |
| 638 def test_modify_series(self): | |
| 639 # Upload 4 images from the same series | |
| 640 for i in range(4): | |
| 641 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 642 | |
| 643 origSeries = DoGet(_REMOTE, '/series')[0] | |
| 644 newSeries = DoPost(_REMOTE, '/series/%s/modify' % origSeries, | |
| 645 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 646 'application/json')['ID'] | |
| 647 | |
| 648 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['ModifiedFrom']) | |
| 649 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances'] | |
| 650 self.assertEqual(4, len(instances)) | |
| 651 for i in instances: | |
| 652 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom'] | |
| 653 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 654 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 655 | |
| 656 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 657 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 658 | |
| 659 | |
| 660 def test_modify_study(self): | |
| 661 # Upload 4 images from the 2 series of the same study | |
| 662 for i in range(4): | |
| 663 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 664 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 665 | |
| 666 origStudy = DoGet(_REMOTE, '/studies')[0] | |
| 667 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy, | |
| 668 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 669 'application/json')['ID'] | |
| 670 | |
| 671 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['ModifiedFrom']) | |
| 672 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series'] | |
| 673 self.assertEqual(2, len(series)) | |
| 674 for s in series: | |
| 675 ss = DoGet(_REMOTE, '/series/%s' % s)['ModifiedFrom'] | |
| 676 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy']) | |
| 677 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy']) | |
| 678 | |
| 679 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances'] | |
| 680 for i in instances: | |
| 681 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom'] | |
| 682 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 683 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 684 | |
| 685 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 686 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 687 | |
| 688 | |
| 689 def test_anonymize_series(self): | |
| 690 # Upload 4 images from the same series | |
| 691 for i in range(4): | |
| 692 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 693 | |
| 694 origSeries = DoGet(_REMOTE, '/series')[0] | |
| 695 newSeries = DoPost(_REMOTE, '/series/%s/anonymize' % origSeries, | |
| 696 '{}', | |
| 697 'application/json')['ID'] | |
| 698 | |
| 699 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['AnonymizedFrom']) | |
| 700 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances'] | |
| 701 self.assertEqual(4, len(instances)) | |
| 702 for i in instances: | |
| 703 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom'] | |
| 704 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 705 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 706 | |
| 707 DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j) | |
| 708 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i)) | |
| 709 | |
| 710 | |
| 711 def test_anonymize_study(self): | |
| 712 # Upload 4 images from the 2 series of the same study | |
| 713 for i in range(4): | |
| 714 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 715 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 716 | |
| 717 origStudy = DoGet(_REMOTE, '/studies')[0] | |
| 718 newStudy = DoPost(_REMOTE,'/studies/%s/anonymize' % origStudy, | |
| 719 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 720 'application/json')['ID'] | |
| 721 | |
| 722 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['AnonymizedFrom']) | |
| 723 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series'] | |
| 724 self.assertEqual(2, len(series)) | |
| 725 for s in series: | |
| 726 ss = DoGet(_REMOTE, '/series/%s' % s)['AnonymizedFrom'] | |
| 727 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy']) | |
| 728 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy']) | |
| 729 | |
| 730 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances'] | |
| 731 for i in instances: | |
| 732 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom'] | |
| 733 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 734 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 735 | |
| 736 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 737 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 11 | 738 |
| 739 | |
| 740 | |
| 741 def test_storescu(self): | |
| 742 # Check emptiness | |
| 743 e = DoGet(_REMOTE, '/exports') | |
| 744 self.assertEqual(0, len(e['Exports'])) | |
| 745 self.assertEqual(0, e['Last']) | |
| 746 self.assertTrue(e['Done']) | |
| 747 e = DoGet(_REMOTE, '/exports?last') | |
| 748 self.assertEqual(0, len(e['Exports'])) | |
| 749 self.assertEqual(0, e['Last']) | |
| 750 self.assertTrue(e['Done']) | |
| 751 | |
| 752 # Add 1 instance | |
| 753 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 754 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 755 | |
| 756 # Export the instance | |
| 757 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') # instance | |
| 758 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 759 self.assertEqual(1, len(DoGet(_LOCAL, '/studies'))) | |
| 760 self.assertEqual(1, len(DoGet(_LOCAL, '/series'))) | |
| 761 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 762 | |
| 763 e = DoGet(_REMOTE, '/exports') | |
| 764 self.assertEqual(1, len(e['Exports'])) | |
| 765 self.assertTrue(e['Done']) | |
| 766 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 767 e = DoGet(_REMOTE, '/exports?limit=1') | |
| 768 self.assertEqual(1, len(e['Exports'])) | |
| 769 self.assertTrue(e['Done']) | |
| 770 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 771 e = DoGet(_REMOTE, '/exports?last') | |
| 772 self.assertEqual(1, len(e['Exports'])) | |
| 773 self.assertTrue(e['Done']) | |
| 774 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 775 seqInstance = e['Last'] | |
| 776 | |
| 777 # Export the series | |
| 778 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', 'text/plain') | |
| 779 | |
| 780 e = DoGet(_REMOTE, '/exports') | |
| 781 self.assertEqual(2, len(e['Exports'])) | |
| 782 self.assertTrue(e['Done']) | |
| 783 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 784 seqSeries = e['Last'] | |
| 785 self.assertNotEqual(seqInstance, seqSeries) | |
| 786 e = DoGet(_REMOTE, '/exports?limit=1&since=0') | |
| 787 self.assertEqual(1, len(e['Exports'])) | |
| 788 self.assertFalse(e['Done']) | |
| 789 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance) | |
| 790 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance)) | |
| 791 self.assertEqual(1, len(e['Exports'])) | |
| 792 self.assertTrue(e['Done']) | |
| 793 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 794 e = DoGet(_REMOTE, '/exports?last') | |
| 795 self.assertEqual(1, len(e['Exports'])) | |
| 796 self.assertTrue(e['Done']) | |
| 797 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 798 | |
| 799 # Export the study | |
| 800 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', 'text/plain') | |
| 801 seqStudy = DoGet(_REMOTE, '/exports')['Last'] | |
| 802 | |
| 803 # Export the patient | |
| 804 j = DoPost(_REMOTE, '/modalities/orthanctest/store', '6816cb19-844d5aee-85245eba-28e841e6-2414fae2', 'text/plain') | |
| 805 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 806 self.assertEqual(1, len(DoGet(_LOCAL, '/studies'))) | |
| 807 self.assertEqual(1, len(DoGet(_LOCAL, '/series'))) | |
| 808 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 809 | |
| 810 e = DoGet(_REMOTE, '/exports') | |
| 811 self.assertEqual(4, len(e['Exports'])) | |
| 812 self.assertTrue(e['Done']) | |
| 813 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 814 seqPatient = e['Last'] | |
| 815 self.assertNotEqual(seqInstance, seqSeries) | |
| 816 self.assertNotEqual(seqSeries, seqStudy) | |
| 817 self.assertNotEqual(seqStudy, seqPatient) | |
| 818 self.assertTrue(seqInstance < seqSeries) | |
| 819 self.assertTrue(seqSeries < seqStudy) | |
| 820 self.assertTrue(seqStudy < seqPatient) | |
| 821 e = DoGet(_REMOTE, '/exports?limit=1&since=0') | |
| 822 self.assertEqual(1, len(e['Exports'])) | |
| 823 self.assertFalse(e['Done']) | |
| 824 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance) | |
| 825 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance)) | |
| 826 self.assertEqual(1, len(e['Exports'])) | |
| 827 self.assertFalse(e['Done']) | |
| 828 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 829 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqSeries)) | |
| 830 self.assertEqual(1, len(e['Exports'])) | |
| 831 self.assertFalse(e['Done']) | |
| 832 self.assertEqual(e['Exports'][-1]['Seq'], seqStudy) | |
| 833 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqStudy)) | |
| 834 self.assertEqual(1, len(e['Exports'])) | |
| 835 self.assertTrue(e['Done']) | |
| 836 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient) | |
| 837 e = DoGet(_REMOTE, '/exports?last') | |
| 838 self.assertEqual(1, len(e['Exports'])) | |
| 839 self.assertTrue(e['Done']) | |
| 840 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient) | |
| 841 | |
| 842 | |
| 843 # Check the content of the logged information | |
| 844 e = DoGet(_REMOTE, '/exports')['Exports'] | |
| 845 | |
| 846 if 'PatientID' in e[0]: | |
| 847 # Since Orthanc 0.8.6 | |
| 848 patient = 'PatientID' | |
| 849 study = 'StudyInstanceUID' | |
| 850 series = 'SeriesInstanceUID' | |
| 851 instance = 'SOPInstanceUID' | |
| 852 else: | |
| 853 # Up to Orthanc 0.8.5 | |
| 854 patient = 'PatientId' | |
| 855 study = 'StudyInstanceUid' | |
| 856 series = 'SeriesInstanceUid' | |
| 857 instance = 'SopInstanceUid' | |
| 858 | |
| 859 for k in range(4): | |
| 860 self.assertTrue('Date' in e[k]) | |
| 861 self.assertTrue('Seq' in e[k]) | |
| 862 self.assertEqual('orthanctest', e[k]['RemoteModality']) | |
| 863 | |
| 864 self.assertEqual(10, len(e[0])) | |
| 865 self.assertEqual('Instance', e[0]['ResourceType']) | |
| 866 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['ID']) | |
| 867 self.assertEqual('/instances/66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['Path']) | |
| 868 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', e[0][instance]) | |
| 869 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', e[0][series]) | |
| 870 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[0][study]) | |
| 871 self.assertEqual('ozp00SjY2xG', e[0][patient]) | |
| 872 | |
| 873 self.assertEqual(9, len(e[1])) | |
| 874 self.assertEqual('Series', e[1]['ResourceType']) | |
| 875 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['ID']) | |
| 876 self.assertEqual('/series/f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['Path']) | |
| 877 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', e[1][series]) | |
| 878 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[1][study]) | |
| 879 self.assertEqual('ozp00SjY2xG', e[1][patient]) | |
| 880 | |
| 881 self.assertEqual(8, len(e[2])) | |
| 882 self.assertEqual('Study', e[2]['ResourceType']) | |
| 883 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['ID']) | |
| 884 self.assertEqual('/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['Path']) | |
| 885 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[2][study]) | |
| 886 self.assertEqual('ozp00SjY2xG', e[2][patient]) | |
| 887 | |
| 888 self.assertEqual(7, len(e[3])) | |
| 889 self.assertEqual('Patient', e[3]['ResourceType']) | |
| 890 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['ID']) | |
| 891 self.assertEqual('/patients/6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['Path']) | |
| 892 self.assertEqual('ozp00SjY2xG', e[3][patient]) | |
| 893 | |
| 894 DropOrthanc(_REMOTE) | |
| 895 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 896 | |
| 897 | |
| 898 def test_store_peer(self): | |
| 899 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports'])) | |
| 900 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 901 | |
| 902 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 903 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 904 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 905 | |
| 906 j = DoPost(_REMOTE, '/peers/peer/store', str(i), 'text/plain') | |
| 907 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 908 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 909 | |
| 910 self.assertEqual(1, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 911 | |
| 912 DropOrthanc(_REMOTE) | |
| 913 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 914 | |
| 915 | |
| 916 def test_bulk_storescu(self): | |
| 917 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 918 | |
| 919 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 920 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 921 | |
| 922 j = DoPost(_REMOTE, '/modalities/orthanctest/store', [ a['ID'], b['ID'] ], 'application/json') | |
| 923 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) | |
| 924 | |
| 925 DropOrthanc(_LOCAL) | |
| 926 | |
| 927 # Send using patient's UUID | |
| 928 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 929 j = DoPost(_REMOTE, '/modalities/orthanctest/store', | |
| 930 [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ], 'application/json') | |
| 931 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) | |
| 932 | |
| 933 | |
| 934 def test_color(self): | |
| 935 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID'] | |
| 936 im = GetImage(_REMOTE, '/instances/%s/preview' % i) | |
| 937 self.assertEqual("RGB", im.mode) | |
| 938 self.assertEqual(41, im.size[0]) | |
| 939 self.assertEqual(41, im.size[1]) | |
| 940 | |
| 941 # http://effbot.org/zone/pil-comparing-images.htm | |
| 13 | 942 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png')) |
| 11 | 943 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None) |
| 944 | |
| 945 | |
| 12 | 946 def test_faking_ruby_put(self): |
| 947 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 948 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 949 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 950 a = DoGet(_REMOTE, '/patients')[0] | |
| 951 b = DoGet(_REMOTE, '/patients')[1] | |
| 952 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 953 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0') | |
| 954 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 955 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '1') | |
| 956 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 957 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0') | |
| 958 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 959 | |
| 960 | |
| 961 def test_faking_ruby_delete(self): | |
| 962 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 963 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 964 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 965 a = DoGet(_REMOTE, '/patients')[0] | |
| 966 b = DoGet(_REMOTE, '/patients')[1] | |
| 967 DoGet(_REMOTE, '/patients/%s' % a, data = { '_method' : 'DELETE' }) | |
| 968 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 969 DoGet(_REMOTE, '/patients/%s' % b, data = { '_method' : 'DELETE' }) | |
| 970 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 971 | |
| 972 | |
| 973 def test_faking_google_put(self): | |
| 974 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 975 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 976 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 977 a = DoGet(_REMOTE, '/patients')[0] | |
| 978 b = DoGet(_REMOTE, '/patients')[1] | |
| 979 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 980 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '0') | |
| 981 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 982 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '1') | |
| 983 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 984 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '0') | |
| 985 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 986 | |
| 987 | |
| 988 def test_faking_google_delete(self): | |
| 989 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 990 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 991 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 992 a = DoGet(_REMOTE, '/patients')[0] | |
| 993 b = DoGet(_REMOTE, '/patients')[1] | |
| 994 DoPost(_REMOTE, '/patients/%s' % a, headers = { 'X-HTTP-Method-Override' : 'DELETE' }) | |
| 995 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 996 DoPost(_REMOTE, '/patients/%s' % b, headers = { 'X-HTTP-Method-Override' : 'DELETE' }) | |
| 997 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 998 | |
| 999 | |
| 1000 def test_lua(self): | |
| 1001 self.assertEqual(42, DoPost(_REMOTE, '/tools/execute-script', 'print(42)')) | |
| 1002 self.assertTrue(IsDefinedInLua(_REMOTE, 'PrintRecursive')) | |
| 1003 self.assertFalse(IsDefinedInLua(_REMOTE, 'HelloWorld')) | |
| 1004 | |
| 1005 | |
| 1006 def test_metadata(self): | |
| 1007 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 1008 p = DoGet(_REMOTE, '/patients')[0] | |
| 1009 i = DoGet(_REMOTE, '/instances')[0] | |
| 1010 | |
| 1011 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) | |
| 1012 self.assertEqual(1, len(m)) | |
| 1013 self.assertEqual('LastUpdate', m[0]) | |
| 1014 | |
| 1015 m = DoGet(_REMOTE, '/instances/%s/metadata' % i) | |
| 145 | 1016 self.assertEqual(8, len(m)) |
| 12 | 1017 self.assertTrue('IndexInSeries' in m) |
| 1018 self.assertTrue('ReceptionDate' in m) | |
| 1019 self.assertTrue('RemoteAET' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1020 self.assertTrue('Origin' in m) |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
1021 self.assertTrue('TransferSyntax' in m) |
|
95
a807a4699eb4
testing of metadata SopClassUid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
1022 self.assertTrue('SopClassUid' in m) |
| 145 | 1023 self.assertTrue('RemoteIP' in m) |
| 1024 self.assertTrue('HttpUsername' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1025 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
|
1026 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
|
1027 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
|
1028 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
|
1029 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i), '1.2.840.10008.5.1.4.1.1.4') |
| 12 | 1030 |
| 1031 # Play with custom metadata | |
| 1032 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'coucou') | |
| 1033 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) | |
| 1034 self.assertEqual(2, len(m)) | |
| 1035 self.assertTrue('LastUpdate' in m) | |
| 1036 self.assertTrue('5555' in m) | |
| 1037 self.assertEqual('coucou', DoGet(_REMOTE, '/patients/%s/metadata/5555' % p)) | |
| 1038 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'hello') | |
| 1039 self.assertEqual('hello', DoGet(_REMOTE, '/patients/%s/metadata/5555' % p)) | |
| 1040 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p) | |
| 1041 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) | |
| 1042 self.assertEqual(1, len(m)) | |
| 1043 self.assertTrue('LastUpdate' in m) | |
| 13 | 1044 |
| 1045 | |
| 1046 def test_statistics(self): | |
| 1047 # Upload 16 instances | |
| 1048 for i in range(4): | |
| 1049 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 1050 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 1051 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 1052 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 1053 | |
| 1054 s = DoGet(_REMOTE, '/statistics') | |
| 1055 self.assertEqual(16, s['CountInstances']) | |
| 1056 self.assertEqual(2, s['CountPatients']) | |
| 1057 self.assertEqual(2, s['CountStudies']) | |
| 1058 self.assertEqual(4, s['CountSeries']) | |
| 1059 d = int(s['TotalUncompressedSize']) | |
| 1060 | |
| 1061 e = 0 | |
| 1062 for patient in DoGet(_REMOTE, '/patients'): | |
| 1063 s = DoGet(_REMOTE, '/patients/%s/statistics' % patient) | |
| 1064 self.assertEqual(8, s['CountInstances']) | |
| 1065 self.assertEqual(1, s['CountStudies']) | |
| 1066 self.assertEqual(2, s['CountSeries']) | |
| 1067 e += int(s['UncompressedSize']) | |
| 1068 | |
| 1069 for study in DoGet(_REMOTE, '/studies'): | |
| 1070 s = DoGet(_REMOTE, '/studies/%s/statistics' % study) | |
| 1071 self.assertEqual(8, s['CountInstances']) | |
| 1072 self.assertEqual(2, s['CountSeries']) | |
| 1073 e += int(s['UncompressedSize']) | |
| 1074 | |
| 1075 for series in DoGet(_REMOTE, '/series'): | |
| 1076 s = DoGet(_REMOTE, '/series/%s/statistics' % series) | |
| 1077 self.assertEqual(4, s['CountInstances']) | |
| 1078 e += int(s['UncompressedSize']) | |
| 1079 | |
| 1080 self.assertEqual(3 * d, e) | |
| 1081 | |
| 1082 | |
| 1083 def test_custom_attachment(self): | |
| 1084 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 1085 patient = DoGet(_REMOTE, '/patients')[0] | |
| 1086 instance = DoGet(_REMOTE, '/instances')[0] | |
| 1087 size = int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']) | |
| 1088 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1089 | |
| 1090 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) | |
| 1091 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance))) | |
| 1092 self.assertTrue('dicom' in DoGet(_REMOTE, '/instances/%s/attachments' % instance)) | |
| 1093 self.assertTrue('dicom-as-json' in DoGet(_REMOTE, '/instances/%s/attachments' % instance)) | |
| 1094 | |
| 1095 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/patients/%s/attachments/22' % patient, 'hello')) | |
| 1096 hello = 'hellohellohellohellohellohellohellohellohello' | |
| 1097 DoPut(_REMOTE, '/patients/%s/attachments/1025' % patient, hello) | |
| 1098 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1099 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1100 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1101 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient))) | |
| 1102 | |
| 1103 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world') | |
| 1104 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1105 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1106 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1107 size + | |
| 1108 int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient)) + | |
| 1109 int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient))) | |
| 1110 | |
| 1111 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) | |
| 1112 self.assertEqual(hello, DoGet(_REMOTE, '/patients/%s/attachments/1025/data' % patient)) | |
| 1113 self.assertEqual('world', DoGet(_REMOTE, '/patients/%s/attachments/1026/data' % patient)) | |
| 1114 DoPost(_REMOTE, '/patients/%s/attachments/1025/verify-md5' % patient) | |
| 1115 DoPost(_REMOTE, '/patients/%s/attachments/1026/verify-md5' % patient) | |
| 1116 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world2') | |
| 1117 self.assertEqual('world2', DoGet(_REMOTE, '/patients/%s/attachments/1026/data' % patient)) | |
| 1118 | |
| 1119 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/instances/%s/attachments/dicom' % instance)) | |
| 1120 DoDelete(_REMOTE, '/patients/%s/attachments/1025' % patient) | |
| 1121 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1122 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1123 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1124 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient))) | |
| 1125 | |
| 1126 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) | |
| 1127 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient) | |
| 1128 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) | |
| 1129 | |
| 1130 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), size) | |
| 1131 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1132 | |
| 1133 | |
| 1134 def test_incoming_storescu(self): | |
| 1135 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 45 | 1136 subprocess.check_call([ FindExecutable('storescu'), |
|
44
ffa542cce638
Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
1137 _REMOTE['Server'], str(_REMOTE['DicomPort']), |
| 13 | 1138 GetDatabasePath('ColorTestImageJ.dcm') ]) |
| 1139 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1140 | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1141 i = DoGet(_REMOTE, '/instances') |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1142 self.assertEqual(1, len(i)) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1143 m = DoGet(_REMOTE, '/instances/%s/metadata' % i[0]) |
| 145 | 1144 self.assertEqual(8, len(m)) |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1145 self.assertTrue('IndexInSeries' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1146 self.assertTrue('ReceptionDate' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1147 self.assertTrue('RemoteAET' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1148 self.assertTrue('Origin' in m) |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
1149 self.assertTrue('TransferSyntax' in m) |
|
95
a807a4699eb4
testing of metadata SopClassUid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
1150 self.assertTrue('SopClassUid' in m) |
| 145 | 1151 self.assertTrue('RemoteIP' in m) |
| 1152 self.assertTrue('CalledAET' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1153 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
|
1154 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
|
1155 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
|
1156 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
|
1157 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
|
1158 |
| 13 | 1159 |
| 1160 def test_incoming_findscu(self): | |
| 1161 UploadInstance(_REMOTE, 'Multiframe.dcm') | |
| 1162 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') | |
| 1163 | |
| 1164 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', '0010,0010' ]) | |
| 1165 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) | |
| 1166 self.assertEqual(2, len(patientNames)) | |
| 1167 self.assertTrue('Test Patient BG ' in patientNames) | |
| 1168 self.assertTrue('Anonymized' in patientNames) | |
| 1169 | |
| 1170 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,0021' ]) | |
| 1171 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i) | |
| 1172 self.assertEqual(2, len(series)) | |
| 1173 self.assertTrue('20070208' in series) | |
| 1174 self.assertTrue('19980312' in series) | |
| 1175 | |
|
56
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1176 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
|
1177 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1178 self.assertEqual(1, len(series)) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1179 self.assertTrue('19980312' in series) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1180 |
| 13 | 1181 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=Anonymized' ]) |
| 1182 series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i) | |
| 1183 self.assertEqual(1, len(series)) | |
| 1184 | |
| 1185 # Test the "CaseSentitivePN" flag (false by default) | |
| 1186 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=anonymized' ]) | |
| 1187 series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i) | |
| 1188 self.assertEqual(1, len(series)) | |
|
66
821d9eb73c45
Test returning sequence values
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
1189 |
| 70 | 1190 # Test range search (buggy if Orthanc <= 0.9.6) |
| 1191 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-' ]) | |
| 1192 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1193 self.assertEqual(2, len(studies)) | |
| 1194 self.assertTrue('20070208' in studies) | |
| 1195 self.assertTrue('19980312' in studies) | |
| 1196 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-19980312' ]) | |
| 1197 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1198 self.assertEqual(1, len(studies)) | |
| 1199 self.assertTrue('19980312' in studies) | |
| 1200 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=-19980312' ]) | |
| 1201 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1202 self.assertEqual(1, len(studies)) | |
| 1203 self.assertTrue('19980312' in studies) | |
| 13 | 1204 |
| 1205 | |
|
191
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1206 def test_incoming_findscu_2(self): |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1207 # This test fails if "LookupMode_DatabaseOnly" is used |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1208 # (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
|
1209 # DICOM tags are returned) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1210 UploadInstance(_REMOTE, 'Multiframe.dcm') |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1211 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1212 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1213 # 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
|
1214 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
|
1215 sequences = re.findall('\(0008,2112\)', i) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1216 self.assertEqual(1, len(sequences)) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1217 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1218 # Test returning a non-main DICOM tag, |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1219 # "SecondaryCaptureDeviceID" (0018,1010), whose value is |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1220 # "MEDPC" in "ColorTestImageJ.dcm" |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1221 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0018,1010' ]) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1222 tags = re.findall('\(0018,1010\).*MEDPC', i) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1223 self.assertEqual(1, len(tags)) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1224 |
|
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 def test_incoming_findscu_3(self): |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1227 # This test fails if "LookupMode_DatabaseOnly" or |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1228 # "LookupMode_DiskOnAnswer" is used, as |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1229 # "SecondaryCaptureDeviceID" (0018,1010) is not a main DICOM |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1230 # 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
|
1231 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
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 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
|
1234 sequences = re.findall('\(0018,1010\)', i) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1235 self.assertEqual(1, len(sequences)) |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1236 |
|
bc8bc83465dc
testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
189
diff
changeset
|
1237 |
| 13 | 1238 def test_incoming_movescu(self): |
| 1239 UploadInstance(_REMOTE, 'Multiframe.dcm') | |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1240 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1241 # No matching patient, so no job is created |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1242 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1243 CallMoveScu([ '--patient', '-k', '0008,0052=PATIENT', '-k', 'PatientID=none' ]) |
| 13 | 1244 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1245 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1246 # 1 Matching patient, track the job |
| 138 | 1247 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
| 1248 '--patient', | |
| 1249 '-k', '0008,0052=PATIENT', | |
| 1250 '-k', 'PatientID=12345678' | |
| 1251 ]))) | |
| 13 | 1252 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) |
| 1253 | |
| 1254 | |
| 1255 def test_findscu(self): | |
| 1256 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1257 j = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] | |
| 1258 k = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] | |
| 1259 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 1260 | |
| 1261 # Test the "find-patient" level | |
| 1262 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }) | |
| 1263 self.assertEqual(1, len(p)) | |
| 1264 self.assertEqual('ozp00SjY2xG', p[0]['PatientID']) | |
| 1265 | |
| 1266 # Test wildcards constraints. The "LO" value representation | |
| 1267 # for PatientID is always case-sensitive, but the "PN" for | |
| 1268 # PatientName might depend on the implementation: | |
| 1269 # "GenerateConfigurationForTests.py" will force it to be case | |
| 1270 # insensitive (which was the default until Orthanc 0.8.6). | |
| 1271 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'K*' }) | |
| 1272 self.assertEqual(1, len(p)) | |
| 1273 | |
| 1274 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'k*' }) | |
| 1275 self.assertEqual(1, len(p)) | |
| 1276 | |
| 1277 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'ozp*' }) | |
| 1278 self.assertEqual(1, len(p)) | |
| 1279 | |
| 1280 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'o?p*' }) | |
| 1281 self.assertEqual(1, len(p)) | |
| 1282 | |
| 1283 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : '0?q*' }) | |
| 1284 self.assertEqual(0, len(p)) | |
| 1285 | |
| 1286 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'B*' }) | |
| 1287 self.assertEqual(0, len(p)) | |
| 1288 | |
| 1289 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'b*' }) | |
| 1290 self.assertEqual(0, len(p)) | |
| 1291 | |
| 1292 DoPost(_REMOTE, '/modalities/orthanctest/store', str(j), 'text/plain') | |
| 1293 DoPost(_REMOTE, '/modalities/orthanctest/store', str(k), 'text/plain') | |
| 1294 DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }) | |
| 1295 self.assertEqual(3, len(DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }))) | |
| 1296 | |
| 1297 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'A*' }) | |
| 1298 self.assertEqual(2, len(p)) | |
| 1299 | |
| 1300 # Test the "find-study" level. This is the instance "ColorTestImageJ.dcm" | |
| 1301 s = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ' }) | |
| 1302 self.assertEqual(1, len(s)) | |
| 1303 self.assertEqual('20070208', s[0]['StudyDate']) | |
| 1304 | |
| 1305 # Test range searches | |
| 1306 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1307 'StudyDate' : '-20070101' }) | |
| 1308 self.assertEqual(0, len(t)) | |
| 1309 | |
| 1310 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1311 'StudyDate' : '20090101-' }) | |
| 1312 self.assertEqual(0, len(t)) | |
| 1313 | |
| 1314 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1315 'StudyDate' : '20070101-' }) | |
| 1316 self.assertEqual(1, len(t)) | |
| 1317 | |
| 1318 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1319 'StudyDate' : '-20090101' }) | |
| 1320 self.assertEqual(1, len(t)) | |
| 1321 | |
| 1322 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1323 'StudyDate' : '20070207-20070207' }) | |
| 1324 self.assertEqual(0, len(t)) | |
| 1325 | |
| 1326 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1327 'StudyDate' : '20070208-20070208' }) | |
| 1328 self.assertEqual(1, len(t)) | |
| 1329 | |
| 1330 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1331 'StudyDate' : '20070209-20070209' }) | |
| 1332 self.assertEqual(0, len(t)) | |
| 1333 | |
| 1334 # Test the ModalitiesInStudy tag | |
| 1335 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1336 'PatientID' : 'B9uTHKOZ', | |
| 1337 'ModalitiesInStudy' : 'US' }) | |
| 1338 self.assertEqual(0, len(t)) | |
| 1339 | |
| 1340 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1341 'PatientID' : 'B9uTHKOZ', | |
| 1342 'ModalitiesInStudy' : 'CT' }) | |
| 1343 self.assertEqual(1, len(t)) | |
| 1344 | |
| 1345 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1346 'PatientID' : 'B9uTHKOZ', | |
| 1347 'ModalitiesInStudy' : 'US\\CT' }) | |
| 1348 self.assertEqual(1, len(t)) | |
| 1349 | |
| 1350 # Test the "find-series" level | |
| 1351 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1352 'PatientID' : 'B9uTHKOZ', | |
| 1353 'StudyInstanceUID' : s[0]['StudyInstanceUID'] }) | |
| 1354 self.assertEqual(1, len(t)) | |
| 1355 | |
| 1356 # Test "\" separator | |
| 1357 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1358 'PatientID' : 'B9uTHKOZ', | |
| 1359 'StudyInstanceUID' : s[0]['StudyInstanceUID'], | |
| 1360 'Modality' : 'MR\\CT\\US' }) | |
| 1361 self.assertEqual(1, len(t)) | |
| 1362 | |
| 1363 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1364 'PatientID' : 'B9uTHKOZ', | |
| 1365 'StudyInstanceUID' : s[0]['StudyInstanceUID'], | |
| 1366 'Modality' : 'MR\\US' }) | |
| 1367 self.assertEqual(0, len(t)) | |
| 1368 | |
| 1369 | |
| 1370 def test_update_modalities(self): | |
| 1371 try: | |
| 1372 DoDelete(_REMOTE, '/modalities/toto') | |
| 1373 except: | |
| 1374 pass | |
| 1375 try: | |
| 1376 DoDelete(_REMOTE, '/modalities/tata') | |
| 1377 except: | |
| 1378 pass | |
| 1379 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto')) | |
| 1380 DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000 ]) | |
| 116 | 1381 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'MedInria' ]) # check backward compatiblity with obsolete manufacturer |
| 1382 DoDelete(_REMOTE, '/modalities/tata') | |
| 124 | 1383 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoUniversalWildcard' ]) |
|
121
1a19f953f53c
also test GenericNoWildcardInDates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
120
diff
changeset
|
1384 DoDelete(_REMOTE, '/modalities/tata') |
|
1a19f953f53c
also test GenericNoWildcardInDates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
120
diff
changeset
|
1385 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoWildcardInDates' ]) |
| 128 | 1386 modalitiesReadback = DoGet(_REMOTE, '/modalities?expand') |
|
182
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1387 self.assertEqual('STORESCP', modalitiesReadback['tata']['AET']) |
|
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1388 self.assertEqual('localhost', modalitiesReadback['tata']['Host']) |
|
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1389 self.assertEqual(2000, modalitiesReadback['tata']['Port']) |
|
7a6b532853ab
modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
181
diff
changeset
|
1390 self.assertEqual('GenericNoWildcardInDates', modalitiesReadback['tata']['Manufacturer']) |
| 116 | 1391 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000, 'InvalidManufacturerName' ])) |
| 13 | 1392 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/toto')) |
| 1393 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/tata')) | |
| 1394 DoDelete(_REMOTE, '/modalities/toto') | |
| 1395 DoDelete(_REMOTE, '/modalities/tata') | |
| 1396 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto')) | |
| 1397 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/tata')) | |
| 1398 | |
| 1399 | |
| 1400 def test_update_peers(self): | |
| 1401 # curl -X PUT http://localhost:8042/peers/toto -d '["http://localhost:8042/"]' -v | |
| 1402 try: | |
| 1403 DoDelete(_REMOTE, '/peers/toto') | |
| 1404 except: | |
| 1405 pass | |
| 1406 try: | |
| 1407 DoDelete(_REMOTE, '/peers/tata') | |
| 1408 except: | |
| 1409 pass | |
| 1410 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto')) | |
| 1411 DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/' ]) | |
| 214 | 1412 DoPut(_REMOTE, '/peers/tata', { 'Url': 'http://localhost:8042/', |
| 1413 'Username': 'user', | |
| 1414 'Password' : 'pass', | |
| 1415 'RemoteSelf' : 'self' }) | |
| 128 | 1416 self.assertTrue('tata' in DoGet(_REMOTE, '/peers')) |
| 1417 peersReadback = DoGet(_REMOTE, '/peers?expand') | |
| 1418 self.assertEqual('http://localhost:8042/', peersReadback['tata']['Url']) | |
| 1419 self.assertEqual('user', peersReadback['tata']['Username']) | |
| 214 | 1420 |
| 1421 if IsOrthancVersionAbove(_REMOTE, 1, 5, 4): | |
| 1422 self.assertEqual(None, peersReadback['tata']['Password']) # make sure no sensitive data is included | |
| 1423 self.assertFalse(peersReadback['tata']['Pkcs11']) # make sure no sensitive data is included | |
| 1424 self.assertEqual('self', peersReadback['tata']['RemoteSelf']) | |
| 1425 else: | |
| 1426 self.assertFalse('Password' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1427 self.assertFalse('Pkcs11' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1428 self.assertFalse('RemoteSelf' in peersReadback['tata']) | |
| 1429 | |
| 128 | 1430 self.assertFalse('CertificateFile' in peersReadback['tata']) # make sure no sensitive data is included |
| 1431 self.assertFalse('CertificateKeyFile' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1432 self.assertFalse('CertificateKeyPassword' in peersReadback['tata']) # make sure no sensitive data is included | |
| 214 | 1433 |
| 13 | 1434 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a' ])) |
| 1435 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a', 'b', 'c' ])) | |
| 1436 self.assertTrue('store' in DoGet(_REMOTE, '/peers/toto')) | |
| 1437 self.assertTrue('store' in DoGet(_REMOTE, '/peers/tata')) | |
| 1438 DoDelete(_REMOTE, '/peers/toto') | |
| 1439 DoDelete(_REMOTE, '/peers/tata') | |
| 1440 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto')) | |
| 1441 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/tata')) | |
| 1442 | |
| 1443 | |
| 1444 def test_mesterhazy_modification(self): | |
| 1445 # When I modify a series ( eg. curl | |
| 1446 # http://localhost:8042/series/uidhere/modify -X POST -d | |
| 1447 # '{"Replace":{"SeriesDate":"19990101"}}' ) the modified | |
| 1448 # series is added to a new Study, instead of the existing | |
| 1449 # Study. Fixed in Orthanc 0.7.5 | |
| 1450 | |
| 1451 u = UploadInstance(_REMOTE, 'DummyCT.dcm') | |
| 1452 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' | |
| 1453 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 1454 | |
| 1455 modified = DoPost(_REMOTE, '/series/%s/modify' % series, | |
| 1456 json.dumps({ "Replace" : { "SeriesDate" : "19990101" }})) | |
| 1457 | |
| 1458 self.assertEqual(study, DoGet(_REMOTE, '/series/%s' % modified['ID']) ['ParentStudy']) | |
| 1459 | |
| 1460 | |
| 1461 def test_create(self): | |
| 1462 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 1463 json.dumps({ | |
| 1464 'PatientName' : 'Jodogne', | |
| 1465 'Modality' : 'CT', | |
| 58 | 1466 'SOPClassUID' : '1.2.840.10008.5.1.4.1.1.1', |
| 13 | 1467 'PixelData' : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==' # red dot in RGBA |
| 1468 })) | |
| 1469 | |
| 1470 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 1471 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip()) | |
| 1472 | |
| 1473 png = GetImage(_REMOTE, '/instances/%s/preview' % i['ID']) | |
| 1474 self.assertEqual((5, 5), png.size) | |
| 1475 | |
| 38 | 1476 j = DoGet(_REMOTE, i['Path']) |
| 1477 self.assertEqual('Instance', j['Type']) | |
| 1478 self.assertEqual(j['ID'], i['ID']) | |
| 1479 | |
| 13 | 1480 |
| 1481 def test_pilates(self): | |
| 1482 # "SCU failed error when accessing orthanc with osirix" by | |
| 1483 # Pilates Agentur (Mar 10, 2014 at 9:33 PM) | |
| 1484 i = UploadInstance(_REMOTE, 'PilatesArgenturGEUltrasoundOsiriX.dcm')['ID'] | |
| 1485 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 1486 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 1487 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 1488 | |
| 1489 | |
| 1490 def test_shared_tags(self): | |
| 1491 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1492 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')['ID'] | |
| 1493 p = DoGet(_REMOTE, '/patients')[0] | |
| 1494 | |
| 1495 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1496 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
|
1497 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
|
1498 |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
1499 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
|
1500 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
|
1501 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
|
1502 |
| 13 | 1503 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) |
| 1504 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1505 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1506 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1507 self.assertFalse('0008,0018' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1508 self.assertFalse('SOPInstanceUID' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1509 | |
| 1510 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/tags' % a)) | |
| 1511 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/tags?simplify' % a)) | |
| 1512 | |
| 1513 | |
| 1514 def test_modules(self): | |
| 1515 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1516 p = DoGet(_REMOTE, '/patients')[0] | |
| 1517 s = DoGet(_REMOTE, '/studies')[0] | |
| 1518 t = DoGet(_REMOTE, '/series')[0] | |
| 1519 | |
| 1520 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/module' % p)) | |
| 1521 self.assertTrue('PatientName' in DoGet(_REMOTE, '/patients/%s/module?simplify' % p)) | |
| 1522 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/studies/%s/module-patient' % p)) | |
| 1523 self.assertTrue('PatientName' in DoGet(_REMOTE, '/studies/%s/module-patient?simplify' % p)) | |
| 1524 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/studies/%s/module' % s)) | |
| 1525 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/studies/%s/module?simplify' % s)) | |
| 1526 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/series/%s/module' % p)) | |
| 1527 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/series/%s/module?simplify' % p)) | |
| 1528 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/module' % a)) | |
| 1529 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/module?simplify' % a)) | |
| 1530 | |
| 1531 | |
| 1532 def test_auto_directory(self): | |
| 1533 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1534 self.assertTrue('now' in DoGet(_REMOTE, '/tools')) | |
| 1535 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
|
1536 self.assertTrue('invalidate-tags' in DoGet(_REMOTE, '/tools')) |
| 13 | 1537 self.assertTrue(len(DoGet(_REMOTE, '/tools/dicom-conformance')) > 1000) |
| 1538 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities')) | |
| 1539 self.assertTrue('echo' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1540 self.assertTrue('find' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1541 self.assertTrue('find-instance' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1542 self.assertTrue('find-patient' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1543 self.assertTrue('find-series' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1544 self.assertTrue('find-study' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1545 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1546 self.assertTrue('store' in DoGet(_REMOTE, '/peers/peer')) | |
| 1547 self.assertTrue('matlab' in DoGet(_REMOTE, '/instances/%s/frames/0' % a)) | |
| 79 | 1548 self.assertTrue('raw' in DoGet(_REMOTE, '/instances/%s/frames/0' % a)) |
| 13 | 1549 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/tools/nope')) |
| 28 | 1550 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope')) |
| 1551 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope/nope.html')) | |
| 1552 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope')[0].status) | |
| 1553 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope/nope.html')[0].status) | |
| 13 | 1554 |
| 1555 | |
| 1556 def test_echo(self): | |
| 1557 DoPost(_REMOTE, '/modalities/orthanctest/echo') | |
| 1558 | |
| 1559 | |
| 1560 def test_xml(self): | |
| 1561 json = DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/json' }) | |
| 1562 xml = minidom.parseString(DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/xml' })) | |
| 1563 items = xml.getElementsByTagName('root')[0].getElementsByTagName('item') | |
| 1564 self.assertEqual(len(items), len(json)) | |
| 1565 | |
| 1566 self.assertTrue('dicom-conformance' in json) | |
| 1567 | |
| 1568 ok = False | |
| 1569 for i in items: | |
| 1570 if i.childNodes[0].data == 'dicom-conformance': | |
| 1571 ok = True | |
| 1572 self.assertTrue(ok) | |
| 1573 | |
| 1574 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1575 def test_googlecode_issue_16(self): |
| 13 | 1576 i = UploadInstance(_REMOTE, 'Issue16.dcm')['ID'] |
| 1577 t = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)['FrameIncrementPointer'] | |
| 1578 self.assertEqual('0018,1063', t) | |
| 1579 | |
| 1580 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1581 def test_googlecode_issue_22(self): |
| 13 | 1582 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] |
| 1583 a = [ | |
| 1584 "f804691f62197040438f4627c6b994f1", # Frame 0 | |
| 1585 "c69eee9a51eea3e8611e82e578897254", | |
| 1586 "315666be83e2d0111c77bc0996d84901", | |
| 1587 "3e27aa959d911172c48a1436443c72b1", | |
| 1588 "958642c9e7e9d232d3869faff546058c", | |
| 1589 "5e7ea8e3e4230cae707d143481355c59", | |
| 1590 "eda37f83558d858a596175aed8b2ad47", | |
| 1591 "486713bd2895c4ecbe0e97715ac7f80a", | |
| 1592 "091ef729eb169e67da8a0faa9631f9a8", | |
| 1593 "5aa2b8c7ffe0a483efaa8e12417686ca", | |
| 1594 "e2f39e85896fe58876654b94cd0b5013", | |
| 1595 "6fd2129e4950abbe1be053bc814d5da8", | |
| 1596 "c3331a8ba7a757f3d423735ab7fa81f9", | |
| 1597 "746f808582156734dd6b6fdfd3a0b72c", | |
| 1598 "8075ea2b227a70c60ea6b7b75a6bb190", | |
| 1599 "806b8b3e300c615099c11a5ec23465aa", | |
| 1600 "7c836aa298ba6eef96434579af631a11", | |
| 1601 "a0357dc9f4f72d73a885c33d7c287446", | |
| 1602 "f25ba3be1cc7d7fad95706adc199ea7d", | |
| 1603 "8b114c526b8cbed6cad8a3248b7b480c", | |
| 1604 "44e6670f127e612a2b4aa60a0d207698", | |
| 1605 "b8945f90fe02facf2ace24ca1ecbe0a5", | |
| 1606 "95c796c2fa8f59018b15cf2987b1f79b", | |
| 1607 "ce0a51ab30224205b44920221dc27351", # Frame 23 | |
| 1608 ] | |
| 1609 | |
| 1610 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 1611 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/preview' % s)) | |
| 1612 | |
| 1613 for i in range(len(a)): | |
| 1614 self.assertEqual(a[i], ComputeMD5(DoGet(_REMOTE, '/instances/%s/frames/%d/preview' % (s, i)))) | |
| 1615 | |
| 1616 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1617 def test_googlecode_issue_19(self): |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
1618 # This is an image with "YBR_FULL" photometric interpretation, it is not supported by Orthanc |
| 13 | 1619 # gdcmconv -i /home/jodogne/DICOM/GdcmDatabase/US_DataSet/HDI5000_US/3EAF5E01 -w -o Issue19.dcm |
| 1620 | |
| 1621 a = UploadInstance(_REMOTE, 'Issue19.dcm')['ID'] | |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
1622 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/941ad3c8-05d05b88-560459f9-0eae0e20-6cddd533/preview')) |
| 13 | 1623 |
| 1624 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1625 def test_googlecode_issue_37(self): |
| 13 | 1626 # Same test for issues 35 and 37. Fixed in Orthanc 0.9.1 |
| 1627 u = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID'] | |
| 1628 | |
| 1629 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 1630 'CaseSensitive' : True, | |
| 1631 'Query' : { 'StationName' : 'SMR4-MP3' }}) | |
| 1632 self.assertEqual(1, len(a)) | |
| 14 | 1633 |
| 1634 | |
| 1635 def test_rest_find(self): | |
| 1636 # Upload 8 instances | |
| 1637 for i in range(2): | |
| 1638 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 1639 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 1640 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 1641 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 1642 | |
| 1643 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 1644 'CaseSensitive' : False, | |
|
194
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1645 'Query' : { 'PatientName' : 'BRAINIX' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1646 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1647 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1648 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1649 'CaseSensitive' : False, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1650 'Query' : { 'PatientName' : 'BRAINIX\\KNEE\\NOPE' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1651 self.assertEqual(2, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1652 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1653 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1654 'CaseSensitive' : False, |
| 14 | 1655 'Query' : { 'PatientName' : '*n*' }}) |
| 1656 self.assertEqual(2, len(a)) | |
| 1657 | |
| 1658 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 1659 'CaseSensitive' : True, | |
| 1660 'Query' : { 'PatientName' : '*n*' }}) | |
| 1661 self.assertEqual(0, len(a)) | |
| 1662 | |
| 1663 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True, | |
| 1664 'Level' : 'Patient', | |
| 1665 'CaseSensitive' : False, | |
| 1666 'Query' : { 'PatientName' : '*ne*' }}) | |
| 1667 self.assertEqual(1, len(a)) | |
| 1668 self.assertEqual('20080822', a[0]['MainDicomTags']['PatientBirthDate']) | |
| 1669 | |
| 1670 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 1671 'CaseSensitive' : True, | |
| 1672 'Query' : { 'PatientName' : '*ne*' }}) | |
| 1673 self.assertEqual(0, len(a)) | |
| 1674 | |
| 1675 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 1676 'CaseSensitive' : True, | |
| 1677 'Query' : { 'PatientName' : '*NE*' }}) | |
| 1678 self.assertEqual(1, len(a)) | |
| 1679 | |
| 1680 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 1681 'CaseSensitive' : True, | |
| 1682 'Query' : { 'PatientName' : '*NE*' }}) | |
| 1683 self.assertEqual(2, len(a)) | |
| 1684 | |
| 1685 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', | |
| 1686 'CaseSensitive' : True, | |
| 1687 'Query' : { 'PatientName' : '*NE*' }}) | |
| 1688 self.assertEqual(4, len(a)) | |
| 1689 | |
| 1690 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', 'Query' : { }}) | |
| 1691 self.assertEqual(2, len(a)) | |
| 1692 | |
| 1693 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', 'Query' : { }}) | |
| 1694 self.assertEqual(2, len(a)) | |
| 1695 | |
| 1696 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', 'Query' : { }}) | |
| 1697 self.assertEqual(4, len(a)) | |
| 1698 | |
| 1699 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', 'Query' : { }}) | |
| 1700 self.assertEqual(8, len(a)) | |
| 1701 | |
|
194
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1702 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1703 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1704 'Query' : { 'StudyDate' : '20061201-20061201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1705 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1706 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1707 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1708 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1709 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1710 'Query' : { 'StudyDate' : '20061201-20091201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1711 self.assertEqual(2, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1712 for i in range(2): |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1713 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1714 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1715 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1716 'Query' : { 'StudyDate' : '20061202-20061202' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1717 self.assertEqual(0, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1718 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1719 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1720 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1721 'Query' : { 'StudyDate' : '-20061201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1722 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1723 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1724 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1725 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1726 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1727 'Query' : { 'StudyDate' : '-20051201' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1728 self.assertEqual(0, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1729 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1730 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1731 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1732 'Query' : { 'StudyDate' : '20061201-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1733 self.assertEqual(2, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1734 for i in range(2): |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1735 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1736 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1737 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1738 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1739 'Query' : { 'StudyDate' : '20061202-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1740 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1741 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1742 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1743 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1744 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1745 'Query' : { 'StudyDate' : '20080819-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1746 self.assertEqual(1, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1747 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName']) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1748 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1749 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1750 'Expand' : True, |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1751 'Query' : { 'StudyDate' : '20080820-' }}) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1752 self.assertEqual(0, len(a)) |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1753 |
|
9f7ae64c0fda
more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
1754 |
| 14 | 1755 |
| 1756 def test_rest_query_retrieve(self): | |
| 1757 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 1758 | |
| 1759 # Upload 8 instances | |
| 1760 for i in range(2): | |
| 1761 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 1762 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 1763 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 1764 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 1765 | |
| 1766 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 1767 for p in DoGet(_REMOTE, '/patients'): | |
| 1768 DoPost(_REMOTE, '/modalities/orthanctest/store', p) | |
| 1769 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 1770 | |
| 1771 for q in DoGet(_REMOTE, '/queries'): | |
| 1772 DoDelete(_REMOTE, '/queries/%s' % q) | |
| 1773 | |
| 1774 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 1775 self.assertEqual(0, len(DoGet(_REMOTE, '/queries'))) | |
| 1776 a = DoPost(_REMOTE, '/modalities/orthanctest/query', { 'Level' : 'Series', | |
| 27 | 1777 'Query' : { |
| 1778 'PatientName' : '*NE*', | |
| 1779 'StudyDate' : '*', | |
| 1780 }})['ID'] | |
| 14 | 1781 self.assertEqual(1, len(DoGet(_REMOTE, '/queries'))) |
| 1782 | |
| 1783 b = DoGet(_REMOTE, '/queries/%s' % a) | |
| 1784 self.assertTrue('answers' in b) | |
| 1785 self.assertTrue('level' in b) | |
| 1786 self.assertTrue('modality' in b) | |
| 1787 self.assertTrue('query' in b) | |
| 1788 self.assertTrue('retrieve' in b) | |
| 1789 self.assertEqual('Series', DoGet(_REMOTE, '/queries/%s/level' % a)) | |
| 1790 self.assertEqual('orthanctest', DoGet(_REMOTE, '/queries/%s/modality' % a)) | |
| 1791 | |
| 1792 q = DoGet(_REMOTE, '/queries/%s/query?simplify' % a) | |
| 27 | 1793 self.assertEqual(2, len(q)) |
| 14 | 1794 self.assertTrue('PatientName' in q) |
| 27 | 1795 self.assertTrue('StudyDate' in q) |
| 14 | 1796 self.assertEqual('*NE*', q['PatientName']) |
| 27 | 1797 self.assertEqual('*', q['StudyDate']) |
| 14 | 1798 |
| 1799 self.assertEqual(2, len(DoGet(_REMOTE, '/queries/%s/answers' % a))) | |
| 1800 | |
| 1801 s = DoGet(_REMOTE, '/queries/%s/answers/0' % a) | |
| 1802 self.assertTrue('content' in s) | |
| 1803 self.assertTrue('retrieve' in s) | |
| 1804 | |
| 1805 s = DoGet(_REMOTE, '/queries/%s/answers/0/content?simplify' % a) | |
| 1806 self.assertEqual('887', s['PatientID']) | |
| 1807 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', s['StudyInstanceUID']) | |
| 1808 | |
| 1809 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 1810 DoPost(_REMOTE, '/queries/%s/answers/0/retrieve' % a, 'ORTHANC') | |
| 1811 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1812 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 1813 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 1814 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) | |
| 1815 | |
| 112 | 1816 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 | 1817 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
| 1818 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 1819 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 1820 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) | |
| 1821 | |
|
186
8feebc2bf9fc
test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
183
diff
changeset
|
1822 # 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
|
1823 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
|
1824 self.assertEqual(2, len(s)) |
|
8feebc2bf9fc
test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
183
diff
changeset
|
1825 for i in range(2): |
|
8feebc2bf9fc
test options expand and limit to /queries/.../answers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
183
diff
changeset
|
1826 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
|
1827 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
|
1828 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
|
1829 |
| 14 | 1830 DoDelete(_REMOTE, '/queries/%s' % a) |
| 1831 self.assertEqual(0, len(DoGet(_REMOTE, '/queries'))) | |
| 1832 | |
| 1833 | |
| 1834 def test_parent(self): | |
| 1835 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1836 patient = '6816cb19-844d5aee-85245eba-28e841e6-2414fae2' | |
| 1837 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' | |
| 1838 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 1839 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d' | |
|
107
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
1840 self.assertEqual(instance, u) |
| 14 | 1841 |
| 1842 a = DoGet(_REMOTE, '/studies/%s/patient' % study) | |
| 1843 self.assertEqual('Patient', a['Type']) | |
| 1844 self.assertEqual(patient, a['ID']) | |
| 1845 | |
| 1846 a = DoGet(_REMOTE, '/series/%s/patient' % series) | |
| 1847 self.assertEqual('Patient', a['Type']) | |
| 1848 self.assertEqual(patient, a['ID']) | |
| 1849 | |
| 1850 a = DoGet(_REMOTE, '/series/%s/study' % series) | |
| 1851 self.assertEqual('Study', a['Type']) | |
| 1852 self.assertEqual(study, a['ID']) | |
| 1853 | |
| 1854 a = DoGet(_REMOTE, '/instances/%s/patient' % instance) | |
| 1855 self.assertEqual('Patient', a['Type']) | |
| 1856 self.assertEqual(patient, a['ID']) | |
| 1857 | |
| 1858 a = DoGet(_REMOTE, '/instances/%s/study' % instance) | |
| 1859 self.assertEqual('Study', a['Type']) | |
| 1860 self.assertEqual(study, a['ID']) | |
| 1861 | |
| 1862 a = DoGet(_REMOTE, '/instances/%s/series' % instance) | |
| 1863 self.assertEqual('Series', a['Type']) | |
| 1864 self.assertEqual(series, a['ID']) | |
| 1865 | |
| 1866 | |
| 1867 def test_shanon(self): | |
| 1868 def Anonymize(instance, replacements = {}): | |
| 119 | 1869 return DoPost(_REMOTE, '/instances/%s/anonymize' % instance, { |
| 1870 'Replace' : replacements, | |
| 1871 'Force' : True, | |
| 1872 }, 'application/json') | |
| 14 | 1873 |
| 1874 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 1875 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1876 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 1877 | |
| 1878 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ] | |
| 1879 ids = [ 'ozp00SjY2xG', | |
| 1880 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 1881 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 1882 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ] | |
| 1883 | |
| 1884 a = ExtractDicomTags(Anonymize(u), tags) | |
| 1885 for i in range(4): | |
| 1886 self.assertNotEqual(ids[i], a[i]) | |
| 1887 self.assertTrue(a[4].startswith('Orthanc')) | |
| 1888 | |
| 1889 a = ExtractDicomTags(Anonymize(u, { 'PatientName' : 'toto' }), tags) | |
| 1890 for i in range(4): | |
| 1891 self.assertNotEqual(ids[i], a[i]) | |
| 1892 self.assertFalse(a[4].startswith('Orthanc')) | |
| 1893 | |
| 1894 a = ExtractDicomTags(Anonymize(u, { 'SOPInstanceUID' : 'instance' }), tags) | |
| 1895 self.assertEqual('instance', a[3]) | |
| 1896 self.assertFalse(a[4].startswith('Orthanc')) | |
| 1897 | |
| 1898 a = ExtractDicomTags(Anonymize(u, { 'SeriesInstanceUID' : 'series' }), tags) | |
| 1899 self.assertEqual('series', a[2]) | |
| 1900 self.assertFalse(a[4].startswith('Orthanc')) | |
| 1901 | |
| 1902 a = ExtractDicomTags(Anonymize(u, { 'StudyInstanceUID' : 'study' }), tags) | |
| 1903 self.assertEqual('study', a[1]) | |
| 1904 self.assertFalse(a[4].startswith('Orthanc')) | |
| 1905 | |
| 1906 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient' }), tags) | |
| 1907 self.assertEqual('patient', a[0]) | |
| 1908 self.assertFalse(a[4].startswith('Orthanc')) | |
| 1909 | |
| 1910 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient', | |
| 1911 'StudyInstanceUID' : 'study', | |
| 1912 'SeriesInstanceUID' : 'series', | |
| 1913 'SOPInstanceUID' : 'instance' }), tags) | |
| 1914 self.assertEqual('patient', a[0]) | |
| 1915 self.assertFalse(a[4].startswith('Orthanc')) | |
| 1916 | |
| 1917 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 1918 | |
| 1919 | |
| 1920 def test_shanon_2(self): | |
| 1921 def Modify(instance, replacements = {}): | |
| 119 | 1922 return DoPost(_REMOTE, '/instances/%s/modify' % instance, { |
| 1923 'Replace' : replacements, | |
| 1924 'Force': True, | |
| 1925 }, 'application/json') | |
| 14 | 1926 |
| 1927 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 1928 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1929 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 1930 | |
| 1931 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ] | |
| 1932 ids = [ 'ozp00SjY2xG', | |
| 1933 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 1934 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 1935 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ] | |
| 1936 | |
| 1937 a = ExtractDicomTags(Modify(u), tags) | |
| 1938 self.assertEqual(ids[0], a[0]) | |
| 1939 self.assertEqual(ids[1], a[1]) | |
| 1940 self.assertEqual(ids[2], a[2]) | |
| 1941 self.assertNotEqual(ids[3], a[3]) | |
| 1942 self.assertEqual(0, len(a[4])) | |
| 1943 | |
| 1944 a = ExtractDicomTags(Modify(u, { 'SOPInstanceUID' : 'instance' }), tags) | |
| 1945 self.assertEqual(ids[0], a[0]) | |
| 1946 self.assertEqual(ids[1], a[1]) | |
| 1947 self.assertEqual(ids[2], a[2]) | |
| 1948 self.assertEqual('instance', a[3]) | |
| 1949 | |
| 1950 a = ExtractDicomTags(Modify(u, { 'SeriesInstanceUID' : 'series' }), tags) | |
| 1951 self.assertEqual(ids[0], a[0]) | |
| 1952 self.assertEqual(ids[1], a[1]) | |
| 1953 self.assertEqual('series', a[2]) | |
| 1954 self.assertNotEqual(ids[3], a[3]) | |
| 1955 | |
| 1956 a = ExtractDicomTags(Modify(u, { 'StudyInstanceUID' : 'study' }), tags) | |
| 1957 self.assertEqual(ids[0], a[0]) | |
| 1958 self.assertEqual('study', a[1]) | |
| 1959 self.assertNotEqual(ids[2], a[2]) | |
| 1960 self.assertNotEqual(ids[3], a[3]) | |
| 1961 | |
| 1962 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient' }), tags) | |
| 1963 self.assertEqual('patient', a[0]) | |
| 1964 self.assertNotEqual(ids[1], a[1]) | |
| 1965 self.assertNotEqual(ids[2], a[2]) | |
| 1966 self.assertNotEqual(ids[3], a[3]) | |
| 1967 | |
| 1968 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient', | |
| 1969 'StudyInstanceUID' : 'study', | |
| 1970 'SeriesInstanceUID' : 'series', | |
| 1971 'SOPInstanceUID' : 'instance' }), tags) | |
| 1972 self.assertEqual('patient', a[0]) | |
| 1973 self.assertEqual('study', a[1]) | |
| 1974 self.assertEqual('series', a[2]) | |
| 1975 self.assertEqual('instance', a[3]) | |
| 1976 | |
| 1977 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 1978 | |
| 1979 | |
| 1980 def test_instances_tags(self): | |
| 1981 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1982 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')['ID'] | |
| 1983 #a = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386937.676343')['ID'] | |
| 1984 #b = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386925.676329')['ID'] | |
| 1985 | |
| 1986 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/patients')[0]) | |
| 1987 self.assertEqual(2, len(i)) | |
| 1988 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 1989 self.assertEqual('887', i[i.keys()[1]]['PatientID']) | |
| 1990 | |
| 1991 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/studies')[0]) | |
| 1992 self.assertEqual(2, len(i)) | |
| 1993 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 1994 self.assertEqual('887', i[i.keys()[1]]['PatientID']) | |
| 1995 | |
| 1996 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 1997 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[0]) | |
| 1998 self.assertEqual(1, len(i)) | |
| 1999 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 2000 | |
| 2001 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[1]) | |
| 2002 self.assertEqual(1, len(i)) | |
| 2003 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 2004 | |
|
136
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2005 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
|
2006 self.assertEqual(1, len(i)) |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2007 self.assertEqual('887', i[i.keys()[0]]['0010,0020']) |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2008 |
| 14 | 2009 |
| 2010 def test_lookup(self): | |
| 2011 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG') | |
| 2012 self.assertEqual(0, len(a)) | |
| 2013 | |
| 2014 UploadInstance(_REMOTE, 'DummyCT.dcm') | |
| 2015 | |
| 2016 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG') | |
| 2017 self.assertEqual(1, len(a)) | |
| 2018 self.assertEqual('Patient', a[0]['Type']) | |
| 2019 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', a[0]['ID']) | |
| 2020 self.assertEqual('/patients/%s' % a[0]['ID'], a[0]['Path']) | |
| 2021 | |
| 2022 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390') | |
| 2023 self.assertEqual(1, len(a)) | |
| 2024 self.assertEqual('Study', a[0]['Type']) | |
| 2025 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', a[0]['ID']) | |
| 2026 self.assertEqual('/studies/%s' % a[0]['ID'], a[0]['Path']) | |
| 2027 | |
| 2028 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394') | |
| 2029 self.assertEqual(1, len(a)) | |
| 2030 self.assertEqual('Series', a[0]['Type']) | |
| 2031 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', a[0]['ID']) | |
| 2032 self.assertEqual('/series/%s' % a[0]['ID'], a[0]['Path']) | |
| 2033 | |
| 2034 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109') | |
| 2035 self.assertEqual(1, len(a)) | |
| 2036 self.assertEqual('Instance', a[0]['Type']) | |
| 2037 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a[0]['ID']) | |
| 2038 self.assertEqual('/instances/%s' % a[0]['ID'], a[0]['Path']) | |
| 2039 | |
| 2040 DropOrthanc(_REMOTE) | |
| 2041 a = DoPost(_REMOTE, '/tools/lookup', '3113719P') | |
| 2042 self.assertEqual(0, len(a)) | |
| 2043 | |
| 15 | 2044 |
| 2045 def test_autorouting(self): | |
| 2046 knee1 = 'Knee/T1/IM-0001-0001.dcm' | |
| 2047 knee2 = 'Knee/T2/IM-0001-0002.dcm' | |
| 2048 other = 'Brainix/Flair/IM-0001-0001.dcm' | |
| 2049 | |
| 2050 # Check that this version is >= 0.8.0 | |
| 2051 self.assertTrue(IsDefinedInLua(_REMOTE, '_InitializeJob')) | |
| 2052 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities')) | |
| 2053 | |
| 2054 UploadInstance(_REMOTE, knee1) | |
| 2055 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 2056 | |
| 2057 DropOrthanc(_REMOTE) | |
| 2058 DropOrthanc(_LOCAL) | |
| 174 | 2059 InstallLuaScriptFromPath(_REMOTE, 'Lua/Autorouting.lua') |
| 15 | 2060 UploadInstance(_REMOTE, knee1) |
| 2061 UploadInstance(_REMOTE, knee2) | |
| 2062 UploadInstance(_REMOTE, other) | |
| 2063 WaitEmpty(_REMOTE) | |
| 174 | 2064 UninstallLuaCallbacks(_REMOTE) |
| 15 | 2065 self.assertEqual(3, len(DoGet(_LOCAL, '/instances'))) |
| 2066 | |
| 2067 DropOrthanc(_REMOTE) | |
| 2068 DropOrthanc(_LOCAL) | |
| 174 | 2069 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingConditional.lua') |
| 15 | 2070 UploadInstance(_REMOTE, knee1) |
| 2071 UploadInstance(_REMOTE, knee2) | |
| 2072 UploadInstance(_REMOTE, other) | |
| 2073 WaitEmpty(_REMOTE) | |
| 174 | 2074 UninstallLuaCallbacks(_REMOTE) |
| 15 | 2075 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
| 2076 | |
| 2077 DropOrthanc(_REMOTE) | |
| 2078 DropOrthanc(_LOCAL) | |
| 174 | 2079 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingModification.lua') |
| 15 | 2080 UploadInstance(_REMOTE, knee1) |
| 2081 WaitEmpty(_REMOTE) | |
| 174 | 2082 UninstallLuaCallbacks(_REMOTE) |
| 15 | 2083 i = DoGet(_LOCAL, '/instances') |
| 2084 self.assertEqual(1, len(i)) | |
| 2085 | |
| 2086 with tempfile.NamedTemporaryFile(delete = True) as f: | |
| 2087 f.write(DoGet(_LOCAL, '/instances/%s/file' % i[0])) | |
| 2088 f.flush() | |
| 45 | 2089 routed = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ]) |
| 15 | 2090 self.assertEqual('My Medical Device', re.search('"StationName">(.*?)<', routed).group(1).strip()) |
| 2091 self.assertEqual(None, re.search('"MilitaryRank"', routed)) | |
| 2092 self.assertEqual(None, re.search('"0051,0010"', routed)) # A private tag | |
| 17 | 2093 |
| 2094 | |
| 2095 def test_storescu_rf(self): | |
| 2096 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] | |
| 2097 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 2098 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 2099 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 18 | 2100 |
| 2101 | |
| 2102 def test_anonymize_instance(self): | |
| 2103 def AnonymizeAndUpload(instanceId, parameters): | |
| 2104 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/anonymize' % instanceId, parameters, | |
| 2105 'application/json'), 'application/dicom')['ID'] | |
| 2106 | |
| 2107 def ModifyAndUpload(instanceId, parameters): | |
| 2108 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/modify' % instanceId, parameters, | |
| 2109 'application/json'), 'application/dicom')['ID'] | |
| 2110 | |
| 2111 a = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] | |
| 2112 s1 = DoGet(_REMOTE, '/instances/%s/content/PatientName' % a) | |
| 2113 s2 = DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % a) # Some private tag | |
| 2114 s3 = DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % a) | |
| 2115 s4 = DoGet(_REMOTE, '/instances/%s/content/SeriesDescription' % a) | |
| 2116 s5 = DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a) | |
| 2117 | |
| 2118 b = AnonymizeAndUpload(a, '{}') | |
| 2119 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2120 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2121 | |
| 2122 # Keep private tag (only OK since Orthanc 0.8.0) | |
| 2123 b = AnonymizeAndUpload(a, '{"Keep":["00e1-10c2"]}') | |
| 2124 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2125 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2126 | |
| 2127 b = AnonymizeAndUpload(a, '{"Keep":["00e1,10c2","PatientName"]}') | |
| 2128 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2129 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2130 | |
| 2131 b = AnonymizeAndUpload(a, '{"Keep":["PatientName"],"Replace":{"00e1,10c2":"Hello"}}') | |
| 2132 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 2133 self.assertTrue(DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b).startswith('Hello')) | |
| 2134 | |
| 2135 # Examples from the Wiki | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
2136 b = AnonymizeAndUpload(a, '{"Replace":{"PatientName":"hello","0010-0020":"world"},"Keep":["StudyDescription", "SeriesDescription"],"KeepPrivateTags": true,"Force":true}') |
| 18 | 2137 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip()) |
| 2138 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip()) | |
| 2139 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b)) | |
| 2140 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b)) | |
| 2141 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b)) | |
| 2142 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2143 DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a) | |
| 2144 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 2145 | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
2146 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Remove":["InstitutionName"],"RemovePrivateTags": true,"Force":true}') |
| 18 | 2147 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip()) |
| 2148 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip()) | |
| 2149 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b)) | |
| 2150 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b)) | |
| 2151 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2152 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 2153 | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
2154 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Force":true}') |
| 18 | 2155 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip()) |
| 2156 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip()) | |
| 2157 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1,10c2' % b)) | |
| 2158 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b)) | |
| 2159 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b)) | |
| 2160 self.assertEqual(s5, DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 2161 | |
| 2162 | |
| 2163 # Test modify non-existing | |
| 2164 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2165 json.dumps({ | |
| 2166 'PatientName' : 'Jodogne', | |
| 2167 'Modality' : 'CT', | |
| 2168 }))['ID'] | |
| 2169 | |
| 2170 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i).strip()) | |
| 2171 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % i)) | |
| 2172 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i).strip()) | |
| 2173 | |
| 2174 b = ModifyAndUpload(i, '{"Replace":{"StudyDescription":"hello","Modality":"world"}}') | |
| 2175 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % b).strip()) | |
| 2176 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % b).strip()) | |
| 2177 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/Modality' % b).strip()) | |
| 2178 | |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2179 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2180 def test_incoming_jpeg(self): |
|
61
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2181 def storescu(image, acceptUnknownSopClassUid): |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2182 if acceptUnknownSopClassUid: |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2183 tmp = [ '-xf', GetDatabasePath('UnknownSopClassUid.cfg'), 'Default' ] |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2184 else: |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2185 tmp = [ '-xs' ] |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2186 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2187 with open(os.devnull, 'w') as FNULL: |
|
61
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2188 subprocess.check_call([ FindExecutable('storescu') ] + tmp + |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2189 [ _REMOTE['Server'], str(_REMOTE['DicomPort']), |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2190 GetDatabasePath(image) ], |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2191 stderr = FNULL) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2192 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2193 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
| 174 | 2194 InstallLuaScriptFromPath(_REMOTE, 'Lua/TransferSyntaxDisable.lua') |
|
61
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2195 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
|
2196 self.assertRaises(Exception, lambda: storescu('UnknownSopClassUid.dcm', True)) |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2197 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
| 174 | 2198 InstallLuaScriptFromPath(_REMOTE, 'Lua/TransferSyntaxEnable.lua') |
|
62
f9c4ce95756f
removal of useless information
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
2199 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
|
2200 storescu('Knix/Loc/IM-0001-0001.dcm', False) |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2201 storescu('UnknownSopClassUid.dcm', True) |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2202 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2203 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2204 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2205 def test_storescu_jpeg(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2206 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2207 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2208 knixStudy = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' |
| 64 | 2209 i = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm')['ID'] |
| 2210 | |
| 2211 # This is JPEG lossless | |
|
136
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2212 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header' % i)['0002,0010']['Value']) |
| 64 | 2213 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
|
2214 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header?short' % i)['0002,0010']) |
| 64 | 2215 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2216 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm') |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2217 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0003.dcm') |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2218 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2219 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
|
2220 b = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2221 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2222 DoPost(_REMOTE, '/modalities/orthanctest/store', [ knixStudy, a, b ]) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2223 self.assertEqual(5, len(DoGet(_LOCAL, '/instances'))) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2224 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2225 self.assertEqual(3, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2226 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2227 DropOrthanc(_REMOTE) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2228 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2229 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2230 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2231 def test_pixel_data(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2232 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
|
2233 color = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2234 phenix = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID'] |
|
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 phenixSize = 358 * 512 * 2 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2237 colorSize = 1000 * 1000 * 3 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2238 jpegSize = 51918 |
|
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 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
|
2241 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
|
2242 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
|
2243 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2244 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
|
2245 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
|
2246 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2247 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
|
2248 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
|
2249 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2250 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2251 def test_decode_brainix(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2252 brainix = [ |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2253 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'], # (*) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2254 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
|
2255 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
|
2256 ] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2257 h = '6fb11b932d535c2be04beabd99793ff8' |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2258 maxValue = 426.0 |
|
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 truth = Image.open(GetDatabasePath('Formats/Brainix.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2261 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2262 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2263 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2264 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2265 truth2 = map(lambda x: min(255, x), truth.getdata()) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2266 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2267 self.AssertSameImages(truth2, '/instances/%s/image-uint8' % i) |
|
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 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
|
2270 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2271 self.AssertSameImages(truth2, '/instances/%s/preview' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2272 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2273 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2274 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
|
2275 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2276 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2277 def test_decode_color(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2278 imagej = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2279 color = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2280 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2281 for i in [ imagej, color ]: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2282 for j in [ 'image-uint8', 'image-uint16', 'image-int16' ]: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2283 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
|
2284 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2285 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
|
2286 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
|
2287 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2288 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
|
2289 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
|
2290 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2291 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2292 def test_decode_rf(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2293 rf = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2294 truth = Image.open(GetDatabasePath('Formats/KarstenHilbertRF.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2295 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2296 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2297 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2298 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2299 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % rf) |
|
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 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
|
2302 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2303 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2304 def test_decode_multiframe(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2305 mf = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2306 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2307 # Test the first frame |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2308 truth = Image.open(GetDatabasePath('Formats/Multiframe0.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2309 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2310 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2311 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2312 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2313 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
|
2314 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2315 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
|
2316 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2317 # Test the last frame |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2318 truth = Image.open(GetDatabasePath('Formats/Multiframe75.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2319 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
|
2320 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2321 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2322 def test_decode_signed(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2323 signed = UploadInstance(_REMOTE, 'SignedCT.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2324 minValue = -2000 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2325 maxValue = 4042 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2326 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2327 truth = Image.open(GetDatabasePath('Formats/SignedCT.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2328 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % signed) |
|
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 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
|
2331 self.AssertSameImages(truth2, '/instances/%s/image-uint16' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2332 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2333 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
|
2334 self.AssertSameImages(truth3, '/instances/%s/image-uint8' % signed) |
|
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 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
|
2337 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
|
2338 self.AssertSameImages(tmp, '/instances/%s/preview' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2339 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2340 self.assertEqual('b57e6c872a3da50877c7da689b03a444', ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % signed))) |
| 22 | 2341 |
| 2342 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
2343 def test_googlecode_issue_32(self): |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2344 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/default-encoding', 'nope')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2345 self.assertEqual('Windows1251', DoPut(_REMOTE, '/tools/default-encoding', 'Windows1251')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2346 self.assertEqual('Windows1251', DoGet(_REMOTE, '/tools/default-encoding')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2347 |
| 22 | 2348 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID'] |
| 2349 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f) | |
| 2350 self.assertEqual(u'Рентгенография', tags['SeriesDescription']) | |
| 2351 self.assertEqual(u'Таз', tags['BodyPartExamined']) | |
| 2352 self.assertEqual(u'Прямая', tags['ViewPosition']) | |
| 2353 | |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2354 # 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
|
2355 self.assertEqual('Latin1', DoPut(_REMOTE, '/tools/default-encoding', 'Latin1')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2356 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2357 DoDelete(_REMOTE, '/instances/%s' % f) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2358 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID'] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2359 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2360 self.assertNotEqual(u'Рентгенография', tags['SeriesDescription']) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2361 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2362 |
| 22 | 2363 def test_encodings(self): |
| 23 | 2364 # Latin-1 (ISO_IR 100) |
| 22 | 2365 brainix = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
| 2366 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % brainix) | |
| 2367 self.assertEqual(u'IRM cérébrale, neuro-crâne', tags['StudyDescription']) | |
| 23 | 2368 |
| 2369 # Latin-2 (ISO_IR 101) | |
| 2370 a = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID'] | |
| 2371 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % a) | |
| 2372 # dcm2xml MarekLatin2.dcm | iconv -f latin2 -t utf-8 | xmllint --format - | |
| 2373 self.assertEqual('Imię i Nazwisko osoby opisującej', | |
| 2374 i['ContentSequence'][4]['ConceptNameCodeSequence'][0]['CodeMeaning'].encode('utf-8')) | |
| 2375 | |
|
26
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2376 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2377 def test_storescu_custom_aet(self): |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2378 # 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
|
2379 # 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
|
2380 # in the REST API)." |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2381 # 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
|
2382 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2383 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2384 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2385 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2386 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2387 c = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0003.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2388 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2389 j = DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2390 'LocalAet' : 'YOP', |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2391 'Resources' : [ a['ID'], b['ID'] ] |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2392 }) |
|
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 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2395 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
|
2396 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2397 DropOrthanc(_LOCAL) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2398 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2399 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2400 j = DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2401 'Resources' : [ c['ID'] ] |
|
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 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2404 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2405 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
|
2406 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2407 DropOrthanc(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2408 DropOrthanc(_LOCAL) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2409 |
| 174 | 2410 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingChangeAet.lua') |
|
26
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2411 DoPost(_REMOTE, '/tools/execute-script', 'aet = "HELLO"', 'application/lua') |
|
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(0, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2414 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2415 WaitEmpty(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2416 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2417 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
|
2418 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2419 DoPost(_REMOTE, '/tools/execute-script', 'aet = nill', 'application/lua') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2420 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2421 WaitEmpty(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2422 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2423 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
|
2424 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2425 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
|
2426 # 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
|
2427 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
|
2428 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
|
2429 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
|
2430 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
|
2431 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
|
2432 |
|
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 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
|
2434 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
|
2435 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
|
2436 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
|
2437 |
|
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 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
|
2439 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
|
2440 |
|
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 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
|
2442 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
|
2443 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
|
2444 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
|
2445 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
|
2446 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
|
2447 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
|
2448 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
|
2449 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
|
2450 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
|
2451 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
|
2452 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
|
2453 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
|
2454 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
|
2455 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
|
2456 |
|
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 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
|
2458 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
|
2459 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
|
2460 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
|
2461 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
|
2462 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
|
2463 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
|
2464 |
|
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 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
|
2466 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
|
2467 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
|
2468 |
|
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 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
|
2470 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
|
2471 self.assertTrue(instance in s) |
| 36 | 2472 |
| 2473 | |
| 2474 def test_create_pdf(self): | |
| 2475 # Upload 4 instances | |
| 2476 brainixInstance = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] | |
| 2477 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 2478 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 2479 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 2480 | |
| 2481 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0' | |
| 2482 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' | |
| 2483 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8' | |
| 2484 | |
| 2485 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f: | |
| 2486 pdf = f.read() | |
| 2487 | |
| 2488 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2489 json.dumps({ | |
| 2490 'Tags' : { | |
| 2491 'PatientName' : 'Jodogne', | |
| 2492 'Modality' : 'CT', | |
| 2493 }, | |
| 2494 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 2495 })) | |
| 2496 | |
| 2497 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 2498 self.assertEqual('OT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip()) | |
| 2499 | |
| 2500 b = DoGet(_REMOTE, '/instances/%s/content/0042-0011' % i['ID']) | |
| 2501 self.assertEqual(len(b), len(pdf) + 1) | |
| 2502 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf + '\0')) | |
| 2503 | |
| 2504 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/tools/create-dicom', | |
| 2505 json.dumps({ | |
| 2506 'Parent' : brainixPatient, | |
| 2507 'Tags' : { | |
| 2508 'PatientName' : 'Jodogne', | |
| 2509 } | |
| 2510 }))) | |
| 2511 | |
| 2512 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2513 json.dumps({ | |
| 2514 'Parent' : brainixPatient, | |
| 2515 'Tags' : { 'StudyDescription' : 'PDF^Patient' }, | |
| 2516 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 2517 })) | |
| 2518 | |
| 2519 self.assertEqual(brainixPatient, DoGet(_REMOTE, '/instances/%s/patient' % i['ID'])['ID']) | |
| 2520 | |
| 2521 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2522 json.dumps({ | |
| 2523 'Parent' : brainixStudy, | |
| 2524 'Tags' : { 'SeriesDescription' : 'PDF^Study' }, | |
| 2525 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 2526 })) | |
| 2527 | |
| 2528 self.assertEqual(brainixStudy, DoGet(_REMOTE, '/instances/%s/study' % i['ID'])['ID']) | |
| 2529 | |
| 2530 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2531 json.dumps({ | |
| 2532 'Parent' : brainixEpi, | |
| 37 | 2533 'Tags' : { 'SpecificCharacterSet' : 'ISO_IR 13' }, |
| 36 | 2534 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) |
| 2535 })) | |
| 2536 | |
| 2537 self.assertEqual(brainixEpi, DoGet(_REMOTE, '/instances/%s/series' % i['ID'])['ID']) | |
| 2538 | |
| 2539 b = DoGet(_REMOTE, '/instances/%s/pdf' % i['ID']) | |
| 2540 self.assertEqual(len(b), len(pdf)) | |
| 2541 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf)) | |
| 2542 | |
| 2543 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/pdf' % brainixInstance)) | |
| 38 | 2544 |
| 2545 | |
| 2546 def test_create_series(self): | |
| 2547 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2548 json.dumps({ | |
| 2549 'Tags' : { | |
| 40 | 2550 'SpecificCharacterSet' : 'ISO_IR 100', |
| 2551 'PatientName' : 'Sébastien Jodogne', | |
| 38 | 2552 'Modality' : 'CT', |
| 2553 }, | |
| 2554 'Content' : [ | |
| 40 | 2555 { |
| 2556 'Content': 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==', # red dot in RGBA | |
| 2557 'Tags' : { 'ImageComments' : 'Tutu' } | |
| 2558 }, | |
| 38 | 2559 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAoUlEQVQ4jZ2SWw3EIBREjwUsYAELa2EtoAULFUCyXAtroRZqoRbox254BdLC/DZnZjoXWJFgCDg8egW2CBEhEnDzyRk+Ecxz2KP/0AL8S99T+jQccAVs22qKwAuPuq0uyNg9cPLh3am+pe/dkHLZtqJHj6vXJrZ7nvzvxxgemXgUwnGfXqpee09mUwp8m022OYP6bLF7mVuVe0y/umxinsAXRd9z0k1ubWsAAAAASUVORK5CYII=', |
| 2560 ] | |
| 2561 })) | |
| 2562 | |
| 2563 s = DoGet(_REMOTE, i['Path']) | |
| 2564 self.assertEqual('Series', s['Type']) | |
| 2565 self.assertEqual(s['ID'], i['ID']) | |
| 2566 self.assertEqual(2, len(s['Instances'])) | |
| 39 | 2567 self.assertEqual(2, s['ExpectedNumberOfInstances']) |
| 2568 self.assertEqual('Complete', s['Status']) | |
| 40 | 2569 |
| 2570 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][0]) | |
| 2571 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][1]) | |
| 2572 self.assertTrue('ImageComments' in a or 'ImageComments' in b) | |
| 2573 if 'ImageComments' in a: | |
| 2574 self.assertEqual('Tutu', a['ImageComments']) | |
| 2575 else: | |
| 2576 self.assertEqual('Tutu', b['ImageComments']) | |
| 2577 | |
| 2578 patient = DoGet(_REMOTE, '/instances/%s/patient' % s['Instances'][0]) | |
| 2579 self.assertEqual(patient['MainDicomTags']['PatientName'].encode('utf-8'), | |
| 2580 'Sébastien Jodogne') | |
| 47 | 2581 |
| 2582 | |
| 2583 def test_create_binary(self): | |
| 2584 binary = ''.join(map(chr, range(256))) | |
| 2585 encoded = 'data:application/octet-stream;base64,' + base64.b64encode(binary) | |
| 2586 tags = { | |
| 2587 'PatientName' : 'Jodogne', | |
| 2588 '8899-8899' : encoded | |
| 2589 } | |
| 2590 | |
| 2591 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2592 json.dumps({ | |
| 2593 'Tags' : tags | |
| 2594 })) | |
| 2595 | |
| 2596 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 2597 self.assertEqual(binary, DoGet(_REMOTE, '/instances/%s/content/8899-8899' % i['ID']).strip()) | |
| 2598 | |
| 2599 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2600 json.dumps({ | |
| 2601 'InterpretBinaryTags' : False, | |
| 2602 'Tags' : tags | |
| 2603 })) | |
| 2604 | |
| 2605 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 2606 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
|
2607 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2608 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2609 def test_patient_ids_collision(self): |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2610 # 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
|
2611 # same PatientID |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2612 for i in range(3): |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2613 UploadInstance(_REMOTE, 'PatientIdsCollision/Image%d.dcm' % (i + 1)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2614 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2615 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2616 'Query' : { 'PatientName' : '*' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2617 self.assertEqual(1, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2618 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
|
2619 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2620 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2621 'CaseSensitive' : True, |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2622 'Query' : { 'PatientName' : 'FOO\\HELLO' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2623 self.assertEqual(2, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2624 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2625 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2626 'CaseSensitive' : False, |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2627 'Query' : { 'PatientName' : 'Foo' }}) |
|
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('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
|
2630 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
|
2631 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
|
2632 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2633 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2634 'Query' : { 'PatientName' : '*' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2635 self.assertEqual(3, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2636 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
|
2637 self.assertTrue('FOO^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2638 self.assertTrue('HELLO^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2639 self.assertTrue('WORLD^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2640 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2641 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
|
2642 self.assertEqual(1, len(set(d))) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2643 self.assertEqual('COMMON', d[0]) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2644 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2645 for i in a: |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2646 d = DoGet(_REMOTE, '/studies/%s' % i) ['MainDicomTags']['StudyDescription'] |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2647 p = DoGet(_REMOTE, '/studies/%s' % i) ['PatientMainDicomTags']['PatientName'] |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2648 self.assertEqual('%s^SERIES' % p, d) |
|
49
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2649 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2650 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2651 def test_bitbucket_issue_4(self): |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2652 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2653 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2654 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2655 UploadInstance(_REMOTE, 'Formats/Jpeg.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2656 UploadInstance(_REMOTE, 'Formats/JpegLossless.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2657 UploadInstance(_REMOTE, 'Formats/Rle.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2658 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2659 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2660 self.assertEqual(6, len(DoGet(_REMOTE, '/instances'))) |
|
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 p = DoGet(_REMOTE, '/patients') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2663 self.assertEqual(2, len(p)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2664 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
|
2665 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
|
2666 self.assertEqual(3, len(i1)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2667 self.assertEqual(3, len(i2)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2668 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2669 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
|
2670 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2671 self.assertEqual(6, len(DoGet(_LOCAL, '/instances'))) |
|
50
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2672 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2673 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2674 def test_create_sequence(self): |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2675 i = DoPost(_REMOTE, '/tools/create-dicom', |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2676 json.dumps({ |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2677 'Tags' : { |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2678 'SpecificCharacterSet': 'ISO_IR 100', # Encode using Latin1 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2679 'PatientName': 'Jodogne^', |
|
51
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2680 'ReferencedStudySequence': GenerateTestSequence(), |
|
50
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2681 } |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2682 }))['ID'] |
|
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 self.assertEqual('Jodogne^', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i)) |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2685 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
|
2686 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
|
2687 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
|
2688 self.assertEqual(u'Sébastien^'.encode('latin-1'), |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2689 DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence/1/StudyDescription' % i)) |
|
51
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2690 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2691 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2692 def test_modify_sequence(self): |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2693 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2694 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
|
2695 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2696 j = DoPost(_REMOTE, '/instances/%s/modify' % i, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2697 json.dumps({ |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2698 "Replace" : { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2699 "PatientName" : "hello", |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2700 'ReferencedStudySequence': GenerateTestSequence(), |
|
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 'application/json') |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2704 j = DoPost(_REMOTE, '/instances', j, 'application/dicom')['ID'] |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2705 DoDelete(_REMOTE, '/instances/%s' % i) |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2706 |
| 52 | 2707 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence' % j))) |
| 2708 | |
| 2709 | |
| 2710 def test_compression(self): | |
| 2711 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 2712 | |
| 2713 data = DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom-as-json/data' % i)[1] | |
| 2714 | |
| 2715 # "StorageCompression" is enabled in the Orthanc to be tested, | |
| 2716 # uncompress the data before running the test | |
| 2717 if DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/is-compressed' % i) != 0: | |
| 2718 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/uncompress' % i) | |
| 2719 | |
| 2720 cs = DoGet(_REMOTE, '/statistics')['TotalDiskSize'] | |
| 2721 us = DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'] | |
| 2722 size = DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % i) | |
| 2723 md5 = DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/md5' % i) | |
| 2724 self.assertEqual(data, DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-data' % i)[1]) | |
| 2725 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-md5' % i)) | |
| 2726 self.assertEqual(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-size' % i)) | |
| 2727 | |
| 2728 ops = DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json' % i) | |
| 2729 self.assertTrue('compress' in ops) | |
| 2730 self.assertTrue('uncompress' in ops) | |
| 2731 self.assertTrue('is-compressed' in ops) | |
| 2732 self.assertEqual(0, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/is-compressed' % i)) | |
| 2733 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/verify-md5' % i) | |
| 2734 | |
| 2735 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/compress' % i) | |
| 2736 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/verify-md5' % i) | |
| 2737 self.assertEqual(1, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/is-compressed' % i)) | |
| 2738 self.assertLess(cs, DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 2739 self.assertEqual(us, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 2740 self.assertGreater(len(data), len(DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-data' % i)[1])) | |
| 2741 self.assertGreater(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-size' % i)) | |
| 2742 self.assertEqual(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % i)) | |
| 2743 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/md5' % i)) | |
| 2744 self.assertNotEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-md5' % i)) | |
| 2745 | |
| 2746 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/uncompress' % i) | |
| 2747 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/verify-md5' % i) | |
| 2748 self.assertEqual(0, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/is-compressed' % i)) | |
| 2749 self.assertEqual(data, DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-data' % i)[1]) | |
| 2750 self.assertEqual(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-size' % i)) | |
| 2751 self.assertEqual(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % i)) | |
| 2752 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/md5' % i)) | |
| 2753 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-md5' % i)) | |
| 2754 self.assertEqual(cs, DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 2755 self.assertEqual(us, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 53 | 2756 |
| 2757 | |
| 2758 def test_ordered_slices(self): | |
| 2759 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] | |
| 2760 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 2761 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 2762 self.assertEqual('Sequence', o['Type']) | |
| 2763 self.assertEqual(1, len(o['Dicom'])) | |
| 2764 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/file', o['Dicom'][0]) | |
| 2765 self.assertEqual(76, len(o['Slices'])) | |
| 2766 for j in range(76): | |
| 2767 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/frames/%d' % j, o['Slices'][j]) | |
| 2768 | |
| 68 | 2769 self.assertEqual(1, len(o['SlicesShort'])) |
| 2770 self.assertEqual('9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02', o['SlicesShort'][0][0]) | |
| 2771 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 2772 self.assertEqual(76, o['SlicesShort'][0][2]) | |
| 2773 | |
| 53 | 2774 i = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
| 2775 j = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')['ID'] | |
| 2776 k = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')['ID'] | |
| 2777 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 2778 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 2779 | |
| 2780 self.assertEqual('Volume', o['Type']) | |
| 2781 self.assertEqual(3, len(o['Dicom'])) | |
| 2782 self.assertEqual(3, len(o['Slices'])) | |
| 2783 self.assertEqual('/instances/%s/file' % i, o['Dicom'][2]) | |
| 2784 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1]) | |
| 2785 self.assertEqual('/instances/%s/file' % k, o['Dicom'][0]) | |
| 2786 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][2]) | |
| 2787 self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1]) | |
| 2788 self.assertEqual('/instances/%s/frames/0' % k, o['Slices'][0]) | |
| 2789 | |
| 68 | 2790 self.assertEqual(3, len(o['SlicesShort'])) |
| 2791 self.assertEqual(k, o['SlicesShort'][0][0]) | |
| 2792 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 2793 self.assertEqual(1, o['SlicesShort'][0][2]) | |
| 2794 self.assertEqual(j, o['SlicesShort'][1][0]) | |
| 2795 self.assertEqual(0, o['SlicesShort'][1][1]) | |
| 2796 self.assertEqual(1, o['SlicesShort'][1][2]) | |
| 2797 self.assertEqual(i, o['SlicesShort'][2][0]) | |
| 2798 self.assertEqual(0, o['SlicesShort'][2][1]) | |
| 2799 self.assertEqual(1, o['SlicesShort'][2][2]) | |
| 2800 | |
| 53 | 2801 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID'] |
| 2802 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm')['ID'] | |
| 2803 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 2804 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 2805 | |
| 2806 self.assertEqual('Sequence', o['Type']) | |
| 2807 self.assertEqual(2, len(o['Dicom'])) | |
| 2808 self.assertEqual(2, len(o['Slices'])) | |
| 2809 self.assertEqual('/instances/%s/file' % i, o['Dicom'][0]) | |
| 2810 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1]) | |
| 2811 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][0]) | |
| 2812 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
|
2813 |
| 68 | 2814 self.assertEqual(2, len(o['SlicesShort'])) |
| 2815 self.assertEqual(i, o['SlicesShort'][0][0]) | |
| 2816 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 2817 self.assertEqual(1, o['SlicesShort'][0][2]) | |
| 2818 self.assertEqual(j, o['SlicesShort'][1][0]) | |
| 2819 self.assertEqual(0, o['SlicesShort'][1][1]) | |
| 2820 self.assertEqual(1, o['SlicesShort'][1][2]) | |
| 2821 | |
| 2822 | |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2823 |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2824 def test_incoming_movescu_accession(self): |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2825 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2826 |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
2827 # No matching patient, so no job is created |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2828 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2829 CallMoveScu([ '--study', '-k', '0008,0052=STUDY', '-k', 'AccessionNumber=nope' ]) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2830 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2831 CallMoveScu([ '--study', '-k', '0008,0052=PATIENT', '-k', 'AccessionNumber=A10003245599' ]) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2832 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
2833 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
2834 # 1 Matching patient, track the job |
| 138 | 2835 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
| 2836 '--study', | |
| 2837 '-k', '0008,0052=STUDY', | |
| 2838 '-k', 'AccessionNumber=A10003245599' | |
| 2839 ]))) | |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
2840 |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2841 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2842 |
| 55 | 2843 |
| 2844 def test_dicom_to_json(self): | |
| 2845 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
|
2846 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
|
2847 |
|
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
2848 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
|
2849 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
|
2850 self.assertTrue(CompareTags(t, json.loads(f.read()), [ |
| 123 | 2851 # Tags for compatibility with DCMTK 3.6.0 |
| 2852 'RETIRED_OtherPatientIDs', | |
| 2853 'OtherPatientIDs', | |
| 2854 'ACR_NEMA_2C_VariablePixelDataGroupLength', | |
|
80
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
2855 ])) |
| 55 | 2856 |
| 2857 t = DoGet(_REMOTE, '/instances/%s/tags' % i) | |
| 2858 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
|
2859 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
|
2860 ])) |
| 55 | 2861 |
|
60
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
2862 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
|
2863 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
|
2864 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
|
2865 ])) |
|
60
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
2866 |
|
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
2867 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
|
2868 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
|
2869 a = json.loads(f.read()) |
|
65
09fc27e0899a
patch for testing windows builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
2870 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
|
2871 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
|
2872 self.assertEqual(aa, tt) |
| 57 | 2873 |
| 2874 | |
| 2875 def test_batch_archive(self): | |
| 2876 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 2877 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') | |
| 2878 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 2879 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0002.dcm') | |
| 2880 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 2881 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm') | |
| 2882 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 2883 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm') | |
| 2884 | |
| 2885 s = DoPost(_REMOTE, '/tools/create-archive', [ ]) | |
| 2886 z = zipfile.ZipFile(StringIO(s), "r") | |
| 2887 self.assertEqual(0, len(z.namelist())) | |
| 2888 | |
| 2889 # One patient | |
| 2890 s = DoPost(_REMOTE, '/tools/create-archive', [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ]) | |
| 2891 z = zipfile.ZipFile(StringIO(s), "r") | |
| 2892 self.assertEqual(4, len(z.namelist())) | |
| 2893 | |
| 2894 # One patient + twice its study + one series from other patient | |
| 2895 s = DoPost(_REMOTE, '/tools/create-archive', [ | |
| 2896 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17', | |
| 2897 '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918', | |
| 2898 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' | |
| 2899 ]) | |
| 2900 z = zipfile.ZipFile(StringIO(s), "r") | |
| 2901 self.assertEqual(6, len(z.namelist())) | |
| 2902 | |
| 2903 # One patient + one series + one instance | |
| 2904 s = DoPost(_REMOTE, '/tools/create-archive', [ | |
| 2905 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17', | |
| 2906 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0', | |
| 2907 '1d429ccb-bdcc78a1-7d129d6a-ba4966ed-fe4dbd87' | |
| 2908 ]) | |
| 2909 z = zipfile.ZipFile(StringIO(s), "r") | |
| 2910 self.assertEqual(7, len(z.namelist())) | |
|
59
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2911 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2912 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2913 def test_decode_brainix_as_jpeg(self): |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2914 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
|
2915 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2916 j = GetImage(_REMOTE, '/instances/%s/preview' % i) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2917 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2918 self.assertEqual(j.size[0], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2919 self.assertEqual(j.size[1], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2920 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2921 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
|
2922 self.assertEqual('PNG', j.format) |
|
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 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
|
2925 self.assertEqual('PNG', j.format) |
|
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, headers = { 'Accept' : 'image/png' }) |
|
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 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2930 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
|
2931 self.assertEqual('JPEG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2932 self.assertEqual(j.size[0], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2933 self.assertEqual(j.size[1], 256) |
|
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 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
|
2936 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
|
2937 self.assertLess(a, b) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2938 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2939 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
|
2940 self.assertEqual('JPEG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2941 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2942 # 16bit encoding is not supported with JPEG |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2943 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
|
2944 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
|
2945 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2946 # No matching content type |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2947 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
|
2948 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2949 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2950 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2951 def test_media_encodings(self): |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2952 ascii = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2953 latin1 = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2954 latin2 = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2955 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2956 tmp = DoPost(_REMOTE, '/tools/create-media', [ascii,latin1,latin2]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2957 z = zipfile.ZipFile(StringIO(tmp), "r") |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2958 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2959 self.assertEqual(4, len(z.namelist())) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2960 self.assertTrue('IMAGES/IM0' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2961 self.assertTrue('IMAGES/IM1' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2962 self.assertTrue('IMAGES/IM2' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2963 self.assertTrue('DICOMDIR' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2964 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2965 try: |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2966 os.remove('/tmp/DICOMDIR') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2967 except: |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2968 # The file does not exist |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2969 pass |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2970 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2971 z.extract('DICOMDIR', '/tmp') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2972 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ], |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2973 stderr = subprocess.STDOUT).split('\n') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2974 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2975 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ], |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2976 stderr = subprocess.STDOUT).split('\n') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2977 self.assertEqual(1, len(a)) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2978 self.assertEqual('', a[0]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2979 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2980 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2981 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
|
2982 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
|
2983 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
|
2984 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2985 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
|
2986 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2987 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2988 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
|
2989 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
|
2990 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
|
2991 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
|
2992 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2993 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
|
2994 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
|
2995 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
|
2996 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
|
2997 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2998 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
|
2999 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
|
3000 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
|
3001 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
|
3002 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3003 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
|
3004 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
|
3005 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
|
3006 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
|
3007 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3008 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
|
3009 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
|
3010 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
|
3011 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
|
3012 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3013 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
|
3014 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
|
3015 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
|
3016 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
|
3017 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3018 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
|
3019 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
|
3020 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
|
3021 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
|
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', 'ModalitiesInStudy' ]) |
|
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('\(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
|
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 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
|
3028 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
|
3029 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
|
3030 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3031 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
|
3032 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
|
3033 self.assertEqual(1, len(s)) |
|
176
48cc188ffb09
strip trailing 0 char that appears with some findscu versions
am@osimis.io
parents:
175
diff
changeset
|
3034 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
|
3035 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
|
3036 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
|
3037 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
3038 |
|
78
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3039 def test_decode_transfer_syntax(self): |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3040 def Check(t, md5): |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3041 i = UploadInstance(_REMOTE, 'TransferSyntaxes/%s.dcm' % t)['ID'] |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3042 |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
3043 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
|
3044 transferSyntax = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i) |
|
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
3045 self.assertEqual(t, transferSyntax) |
|
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
3046 |
|
78
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3047 if md5 == None: |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3048 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
|
3049 else: |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3050 m = ComputeMD5(DoGet(_REMOTE, '/instances/%s/preview' % i)) |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3051 self.assertEqual(m, md5) |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3052 |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3053 Check('1.2.840.10008.1.2.1', 'fae08d5415c4c0cd2cdbae4522408631') |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3054 Check('1.2.840.10008.1.2.2', 'f3d9784768b8feb54d6a50b6d5c37682') |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3055 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
|
3056 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
|
3057 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
|
3058 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
|
3059 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
|
3060 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
|
3061 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
|
3062 Check('1.2.840.10008.1.2', 'd54aed9f67a100984b42942cc2e9939b') |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3063 Check('1.2.840.10008.1.2.4.90', None) # JPEG-2000 image, not supported |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
3064 Check('1.2.840.10008.1.2.4.91', None) # JPEG-2000 image, not supported |
| 79 | 3065 |
| 3066 | |
| 3067 def test_raw_frame(self): | |
| 3068 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] | |
| 3069 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 3070 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3071 self.assertEqual(512 * 512 * 2, len(a)) | |
| 3072 self.assertEqual(512 * 512 * 2, len(DoGet(_REMOTE, '/instances/%s/frames/23/raw' % s))) | |
| 3073 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/raw' % s)) | |
| 3074 self.assertEqual('1914287dc4d958eca21fdaacfb3482fa', ComputeMD5(a)) | |
| 3075 | |
| 3076 s = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] | |
| 3077 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 3078 self.assertEqual(186274, len(DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s))) | |
| 3079 self.assertEqual(189424, len(DoGet(_REMOTE, '/instances/%s/frames/75/raw' % s))) | |
| 3080 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/76/raw' % s)) | |
| 3081 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3082 self.assertEqual("L", im.mode) | |
| 3083 self.assertEqual(512, im.size[0]) | |
| 3084 self.assertEqual(512, im.size[1]) | |
| 3085 | |
| 3086 # Test an image with 2 JPEG frames spread over multiple fragments | |
| 3087 s = UploadInstance(_REMOTE, 'LenaTwiceWithFragments.dcm')['ID'] | |
| 3088 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 3089 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3090 b = DoGet(_REMOTE, '/instances/%s/frames/1/raw' % s) | |
| 3091 self.assertEqual(69214, len(a)) | |
| 3092 self.assertEqual(ComputeMD5(a), ComputeMD5(b)) | |
| 3093 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/2/raw' % s)) | |
| 3094 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 3095 self.assertEqual("RGB", im.mode) | |
| 3096 self.assertEqual(512, im.size[0]) | |
| 3097 self.assertEqual(512, im.size[1]) | |
| 3098 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % s) | |
| 3099 self.assertEqual("RGB", im.mode) | |
| 3100 self.assertEqual(512, im.size[0]) | |
| 3101 self.assertEqual(512, im.size[1]) | |
| 81 | 3102 |
| 3103 | |
| 3104 | |
| 3105 def test_rest_movescu(self): | |
| 3106 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 3107 | |
| 3108 # Upload 4 instances | |
| 3109 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 3110 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm') | |
| 3111 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 3112 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 3113 | |
| 3114 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 3115 for p in DoGet(_REMOTE, '/patients'): | |
| 3116 DoPost(_REMOTE, '/modalities/orthanctest/store', p) | |
| 3117 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 3118 | |
| 3119 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 3120 | |
| 3121 # Upload instance Brainix/Flair/IM-0001-0001.dcm | |
| 3122 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Instance', | |
| 3123 'Resources' : [ | |
| 3124 { | |
| 3125 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775', | |
| 3126 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', | |
| 3127 'SOPInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549', | |
| 3128 } | |
| 3129 ]}) | |
| 3130 | |
| 3131 # Upload series Brainix/Flair/* | |
| 3132 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 3133 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 3134 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 3135 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 3136 | |
| 3137 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series', | |
| 3138 'Resources' : [ | |
| 3139 { | |
| 3140 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775', | |
| 3141 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', | |
| 3142 } | |
| 3143 ]}) | |
| 3144 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 3145 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 3146 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 3147 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) | |
| 3148 | |
| 3149 # Upload series Brainix/Epi/* | |
| 3150 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series', | |
| 3151 'Resources' : [ | |
| 3152 { | |
| 3153 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775', | |
| 3154 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314125550', | |
| 3155 } | |
| 3156 ]}) | |
| 3157 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 3158 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 3159 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 3160 self.assertEqual(3, len(DoGet(_REMOTE, '/instances'))) | |
| 3161 | |
| 3162 # Upload study Knee/* | |
| 3163 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Study', | |
| 3164 'Resources' : [ | |
| 3165 { | |
| 3166 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881', | |
| 3167 } | |
| 3168 ]}) | |
| 3169 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 3170 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) | |
| 3171 self.assertEqual(3, len(DoGet(_REMOTE, '/series'))) | |
| 3172 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) | |
| 3173 | |
| 3174 # Reset | |
| 3175 for p in DoGet(_REMOTE, '/patients'): | |
| 3176 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 3177 | |
| 3178 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 3179 | |
| 3180 | |
| 3181 # Upload all at once | |
| 3182 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Study', | |
| 3183 'Resources' : [ | |
| 3184 { | |
| 3185 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881', | |
| 3186 }, | |
| 3187 { | |
| 3188 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775', | |
| 3189 } | |
| 3190 ]}) | |
| 3191 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 3192 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) | |
| 3193 self.assertEqual(3, len(DoGet(_REMOTE, '/series'))) | |
| 3194 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) | |
| 3195 | |
|
86
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3196 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3197 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3198 def test_reconstruct_json(self): |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3199 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3200 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3201 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3202 first = DoGet(_REMOTE, '/instances/%s/tags' % instance) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3203 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3204 self.assertEqual('TWINOW', first['0008,1010']['Value']) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3205 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance))) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3206 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3207 # Cannot delete the "DICOM" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3208 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
|
3209 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3210 # Can delete the "DICOM as JSON" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3211 r = DoDelete(_REMOTE, '/instances/%s/attachments/dicom-as-json' % instance) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3212 self.assertTrue(type(r) is dict and len(r) == 0) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3213 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3214 # Only the "DICOM" attachment subsists |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3215 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance))) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3216 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3217 # Cannot manually reconstruct the "DICOM as JSON" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3218 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
|
3219 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3220 # Transparently reconstruct the "DICOM as JSON" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3221 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
|
3222 second = DoGet(_REMOTE, '/instances/%s/tags' % instance) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3223 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance))) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3224 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3225 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
|
3226 self.assertEqual(str(first), str(second)) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3227 self.assertEqual(str(first), str(third)) |
|
87
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3228 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3229 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3230 def test_reconstruct_json2(self): |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3231 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3232 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3233 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
|
3234 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
|
3235 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3236 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
|
3237 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
|
3238 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3239 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
|
3240 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
|
3241 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3242 DoPost(_REMOTE, '/tools/invalidate-tags', '', 'text/plain') |
|
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 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
|
3245 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
|
3246 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3247 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
|
3248 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
|
3249 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3250 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
|
3251 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
|
3252 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3253 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3254 def test_private_tags(self): |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3255 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3256 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
|
3257 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
|
3258 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
|
3259 |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3260 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3261 def test_findscu_encoding(self): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3262 # Check out ../Database/Encodings/Generate.sh |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3263 TEST = u'Test-éüäöòДΘĝדصķћ๛ﾈİ' |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3264 ENCODINGS = { |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3265 'Arabic' : [ 'ISO_IR 127' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3266 'Ascii' : [ 'ISO_IR 6' ], # More accurately, ISO 646 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3267 'Cyrillic' : [ 'ISO_IR 144' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3268 'Greek' : [ 'ISO_IR 126' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3269 'Hebrew' : [ 'ISO_IR 138' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3270 'Japanese' : [ 'ISO_IR 13', 'shift-jis' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3271 'Latin1' : [ 'ISO_IR 100' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3272 'Latin2' : [ 'ISO_IR 101' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3273 'Latin3' : [ 'ISO_IR 109' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3274 'Latin4' : [ 'ISO_IR 110' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3275 'Latin5' : [ 'ISO_IR 148' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3276 'Thai' : [ 'ISO_IR 166', 'tis-620' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3277 'Utf8' : [ 'ISO_IR 192' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3278 } |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3279 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3280 for name in ENCODINGS.iterkeys(): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3281 if len(ENCODINGS[name]) == 1: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3282 ENCODINGS[name].append(name.lower()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3283 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3284 UploadInstance(_REMOTE, 'Encodings/Lena-utf8.dcm') |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3285 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3286 for name in ENCODINGS.iterkeys(): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3287 self.assertEqual(name, DoPut(_REMOTE, '/tools/default-encoding', name)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3288 self.assertEqual(name, DoGet(_REMOTE, '/tools/default-encoding')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3289 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3290 i = CallFindScu([ '-k', '0008,0052=STUDY', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3291 '-k', 'SpecificCharacterSet', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3292 '-k', 'PatientName' ]) |
|
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 characterSet = re.findall('\(0008,0005\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3295 self.assertEqual(1, len(characterSet)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3296 self.assertEqual(ENCODINGS[name][0], characterSet[0].strip()) |
|
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 patientName = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3299 self.assertEqual(1, len(patientName)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3300 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3301 expected = TEST.encode(ENCODINGS[name][1], 'ignore') |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3302 self.assertEqual(expected, patientName[0].strip()) |
|
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 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3305 #for master in ENCODINGS: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3306 for master in [ 'Latin1', 'Utf8', 'Cyrillic' ]: # Shortcut to speedup tests |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3307 self.assertEqual(master, DoPut(_REMOTE, '/tools/default-encoding', master)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3308 self.assertEqual(master, DoGet(_REMOTE, '/tools/default-encoding')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3309 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3310 for name in ENCODINGS: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3311 DropOrthanc(_REMOTE) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3312 UploadInstance(_REMOTE, 'Encodings/Lena-%s.dcm' % ENCODINGS[name][1]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3313 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3314 i = CallFindScu([ '-k', '0008,0052=STUDY', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3315 '-k', 'PatientID', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3316 '-k', 'SpecificCharacterSet', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3317 '-k', 'PatientName' ]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3318 i = i.decode(ENCODINGS[master][1]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3319 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3320 characterSet = re.findall('\(0008,0005\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3321 self.assertEqual(1, len(characterSet)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3322 self.assertEqual(ENCODINGS[master][0], characterSet[0].strip()) |
|
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 patientId = re.findall('\(0010,0020\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3325 self.assertEqual(1, len(patientId)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3326 self.assertEqual(ENCODINGS[name][1], patientId[0].strip()) |
|
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 patientName = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3329 self.assertEqual(1, len(patientName)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3330 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3331 tmp = ENCODINGS[name][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3332 expected = TEST.encode(tmp, 'ignore').decode(tmp) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3333 tmp = ENCODINGS[master][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3334 expected = expected.encode(tmp, 'ignore').decode(tmp) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3335 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3336 self.assertEqual(expected, patientName[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 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3339 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True, |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3340 'Level' : 'Study', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3341 'Query' : { }}) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3342 self.assertEqual(1, len(a)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3343 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3344 tmp = ENCODINGS[name][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3345 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
|
3346 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3347 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3348 def test_reconstruct(self): |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3349 def CompareMainDicomTag(expected, instance, level, tag): |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3350 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
|
3351 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3352 a = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3353 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3354 studies = DoGet(_REMOTE, '/studies/') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3355 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3356 self.assertEqual(1, len(studies)) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3357 self.assertEqual(1, len(DoGet(_REMOTE, '/series/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3358 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3359 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3360 modified = DoPost(_REMOTE, '/studies/%s/modify' % studies[0], { |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3361 "Replace" : { |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3362 "StudyDescription" : "hello", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3363 "SeriesDescription" : "world", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3364 "SOPClassUID" : "test", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3365 "SOPInstanceUID" : "myid", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3366 }, |
| 119 | 3367 "Keep" : [ "StudyInstanceUID", "SeriesInstanceUID" ], |
| 3368 "Force" : True | |
|
96
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3369 }) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3370 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3371 instances = DoGet(_REMOTE, '/instances/') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3372 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3373 self.assertEqual(1, len(DoGet(_REMOTE, '/studies/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3374 self.assertEqual(1, len(DoGet(_REMOTE, '/series/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3375 self.assertEqual(2, len(instances)) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3376 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3377 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
|
3378 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3379 CompareMainDicomTag('Knee (R)', a, 'study', 'StudyDescription') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3380 CompareMainDicomTag('AX. FSE PD', a, 'series', 'SeriesDescription') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3381 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
|
3382 CompareMainDicomTag('myid', b, '', 'SOPInstanceUID') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3383 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
|
3384 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
|
3385 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3386 DoPost(_REMOTE, '/instances/%s/reconstruct' % b, {}) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3387 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3388 CompareMainDicomTag('hello', a, 'study', 'StudyDescription') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3389 CompareMainDicomTag('world', a, 'series', 'SeriesDescription') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3390 CompareMainDicomTag('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a, '', 'SOPInstanceUID') |
| 102 | 3391 |
| 104 | 3392 def test_httpClient_lua(self): |
| 3393 with open(GetDatabasePath('Lua/HttpClient.lua'), 'r') as f: | |
| 102 | 3394 result = DoPost(_REMOTE, '/tools/execute-script', f.read(), 'application/lua') |
| 3395 | |
| 3396 self.assertIn('OK', result) | |
|
107
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3397 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3398 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3399 def test_bitbucket_issue_44(self): |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3400 # 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
|
3401 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3402 UploadInstance(_REMOTE, 'Issue44/Monochrome2.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3403 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3404 # dcmcjpeg +ua +eb Monochrome1.dcm Monochrome1-Jpeg.dcm |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3405 UploadInstance(_REMOTE, 'Issue44/Monochrome1-Jpeg.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3406 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3407 # dcmcjpeg +ua Monochrome1.dcm Monochrome1-JpegLS.dcm |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3408 UploadInstance(_REMOTE, 'Issue44/Monochrome1-JpegLS.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3409 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3410 monochrome1 = 'bcdd600a-a6a9c522-5f0a6e84-8657c9f3-b76e59b7' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3411 monochrome1_jpeg = '9df82121-208a2da8-0038674a-3d7a773b-b7008cd2' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3412 monochrome1_jpegls = '0486d1a2-9165573f-b1976b20-e927b016-6b8d67ab' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3413 monochrome2 = 'f00947b7-f61f7164-c93414d1-c6fbda6a-9e92ed20' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3414 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3415 for i in [ monochrome1, monochrome1_jpeg, monochrome1_jpegls ]: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3416 im = GetImage(_REMOTE, '/instances/%s/preview' % i) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3417 self.assertEqual("L", im.mode) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3418 self.assertEqual(2010, im.size[0]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3419 self.assertEqual(2446, im.size[1]) |
|
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 # 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
|
3422 # white (255), should be rendered as black (0) => invert |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3423 if i == monochrome1_jpeg: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3424 # Add some tolerance because of JPEG destructive compression |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3425 self.assertGreater(10, im.getpixel((0,0))) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3426 else: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3427 self.assertEqual(0, im.getpixel((0,0))) |
|
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 im = GetImage(_REMOTE, '/instances/%s/preview' % monochrome2) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3430 self.assertEqual("L", im.mode) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3431 self.assertEqual(1572, im.size[0]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3432 self.assertEqual(2010, im.size[1]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3433 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3434 # 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
|
3435 # white (255), should be rendered as white (255) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3436 self.assertEqual(255, im.getpixel((0,0))) |
|
111
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3437 |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3438 |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3439 def test_bitbucket_issue_42(self): |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3440 # https://bitbucket.org/sjodogne/orthanc/issues/42/fails-to-modify-a-dicom-video-file |
| 123 | 3441 # 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
|
3442 UploadInstance(_REMOTE, 'Issue42.dcm')['ID'] |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3443 modified = DoPost(_REMOTE, |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3444 '/patients/da128605-e040d0c4-310615d2-3475da63-df2d1ef4/modify', |
| 119 | 3445 '{"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
|
3446 'application/json') |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3447 self.assertTrue('PatientID' in modified) |
|
113
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3448 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3449 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3450 def test_rest_find_limit(self): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3451 # 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
|
3452 # 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
|
3453 |
|
113
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3454 # Upload 6 instances |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3455 brainix = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3456 knee = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3457 for i in range(2): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3458 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
|
3459 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
|
3460 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
|
3461 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3462 # Check using BRAINIX |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3463 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3464 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3465 'Limit' : 10 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3466 self.assertEqual(4, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3467 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3468 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3469 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3470 'Limit' : 4 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3471 self.assertEqual(4, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3472 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3473 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3474 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3475 'Since' : 2, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3476 'Limit' : 4 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3477 self.assertEqual(2, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3478 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3479 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3480 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3481 'Limit' : 3 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3482 self.assertEqual(3, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3483 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3484 b = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3485 for i in range(4): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3486 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3487 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3488 'Limit' : 1, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3489 'Since' : i }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3490 self.assertEqual(1, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3491 b.append(a[0]) |
|
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 # 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
|
3494 self.assertEqual(0, len(set(b) ^ set(brainix))) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3495 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3496 # Check using KNEE |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3497 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3498 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3499 'Limit' : 10 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3500 self.assertEqual(2, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3501 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3502 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3503 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3504 'Limit' : 2 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3505 self.assertEqual(2, len(a)) |
|
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 b = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3508 for i in range(2): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3509 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3510 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3511 'Limit' : 1, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3512 'Since' : i }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3513 self.assertEqual(1, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3514 b.append(a[0]) |
|
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 self.assertEqual(0, len(set(b) ^ set(knee))) |
|
115
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3517 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3518 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3519 def test_bitbucket_issue_46(self): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3520 # "PHI remaining after anonymization" |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3521 # https://bitbucket.org/sjodogne/orthanc/issues/46 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3522 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3523 def GetAnonymizedTags(study, version): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3524 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3525 { 'DicomVersion' : version }, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3526 'application/json') ['ID'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3527 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3528 self.assertEqual(1, len(a)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3529 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3530 instance = a[0]['ID'] |
|
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 return (instance, DoGet(_REMOTE, '/instances/%s/tags' % instance)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3533 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3534 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm') |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3535 origStudy = '6068a14b-d4df27af-9ec22145-538772d8-74f228ff' |
|
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 # 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
|
3538 # (Patient's Mother's Birth Name) tags |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3539 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3540 '{"Replace":{"0010,1060":"OSIMIS","0032,1033":"MOTHER"}}', |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3541 'application/json')['ID'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3542 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3543 # 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
|
3544 # 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
|
3545 (instance, tags) = GetAnonymizedTags(newStudy, "2008") |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3546 self.assertTrue('0032,1033' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3547 self.assertTrue('0010,1060' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3548 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3549 # 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
|
3550 # 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
|
3551 (instance, tags) = GetAnonymizedTags(newStudy, "2017c") |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3552 self.assertFalse('0032,1033' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3553 self.assertFalse('0010,1060' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3554 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3555 t = {} |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3556 for (key, value) in tags.iteritems(): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3557 t[value['Name']] = value['Value'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3558 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3559 self.assertEqual('', t['StudyDate']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3560 self.assertEqual('', t['StudyTime']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3561 self.assertEqual('', t['PatientSex']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3562 self.assertFalse('SeriesDate' in t) # Type 3 tag => null |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3563 self.assertFalse('SeriesTime' in t) # Type 3 tag => null |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3564 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3565 with tempfile.NamedTemporaryFile(delete = True) as f: |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3566 # 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
|
3567 f.write(DoGet(_REMOTE, '/instances/%s/file' % instance)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3568 f.flush() |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3569 subprocess.check_output([ FindExecutable('dciodvfy'), f.name ], |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3570 stderr = subprocess.STDOUT).split('\n') |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3571 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3572 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3573 def test_bitbucket_issue_55(self): |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3574 def Run(modify, query): |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3575 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3576 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3577 operation = 'modify' if modify else 'anonymize' |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3578 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3579 self.assertRaises(Exception, lambda: DoPost( |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3580 _REMOTE, '/studies/%s/%s' % (study, operation), query)) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3581 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3582 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3583 query["Force"] = True |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3584 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
|
3585 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3586 DoDelete(_REMOTE, a) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3587 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3588 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3589 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3590 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3591 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' |
|
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 Run(True, { "Replace" : { "StudyInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3594 Run(True, { "Replace" : { "SeriesInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3595 Run(True, { "Replace" : { "SOPInstanceUID" : "world" } }) |
|
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 Run(False, { "Keep" : [ "StudyInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3598 Run(False, { "Keep" : [ "SeriesInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3599 Run(False, { "Keep" : [ "SOPInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3600 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3601 Run(False, { "Replace" : { "StudyInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3602 Run(False, { "Replace" : { "SeriesInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3603 Run(False, { "Replace" : { "SOPInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3604 |
|
120
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3605 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3606 def test_bitbucket_issue_56(self): |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3607 # Case-insensitive matching over accents. This test assumes |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3608 # that the "CaseSensitivePN" configuration option of Orthanc |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3609 # is set to "false" (default value). |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3610 # https://bitbucket.org/sjodogne/orthanc/issues/56 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3611 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3612 def Check(name, expected, expectedSensitive): |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3613 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
|
3614 '-k', '0008,0052=PATIENT', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3615 '-k', 'PatientName=%s' % name ]) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3616 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', a) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3617 self.assertEqual(expected, len(patientNames)) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3618 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3619 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3620 'CaseSensitive' : False, |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3621 'Query' : { 'PatientName' : name }}) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3622 self.assertEqual(expected, len(a)) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3623 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3624 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3625 'CaseSensitive' : True, |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3626 'Query' : { 'PatientName' : name }}) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3627 self.assertEqual(expectedSensitive, len(a)) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3628 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3629 UploadInstance(_REMOTE, 'Encodings/Lena-latin1.dcm') |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3630 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3631 # WildcardConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3632 Check('TeSt*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3633 Check('TeSt-a*', 0, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3634 Check('TeSt-É*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3635 Check('TeSt-é*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3636 Check('Test-é*', 1, 1) |
|
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 # ListConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3639 Check('Test-éüäöò\\nope', 1, 1) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3640 Check('Test-ÉÜÄÖÒ\\nope', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3641 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3642 # ValueConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3643 Check('Test-éüäöò', 1, 1) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3644 Check('Test-ÉÜÄÖÒ', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3645 |
| 125 | 3646 |
| 3647 def test_gbk_alias(self): | |
| 3648 # https://groups.google.com/d/msg/orthanc-users/WMM8LMbjpUc/02-1f_yFCgAJ | |
| 3649 # This test fails on Orthanc <= 1.3.0 | |
| 3650 i = UploadInstance(_REMOTE, '2017-09-19-GBK-Tumashu.dcm')['ID'] | |
| 3651 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) | |
| 3652 self.assertEqual(tags['PatientName'], u'徐浩凯') | |
| 3653 self.assertEqual(tags['InstitutionName'], u'灌云县疾病预防控制中心') | |
| 126 | 3654 |
| 3655 | |
| 3656 def test_long_tag(self): | |
| 3657 i = UploadInstance(_REMOTE, 'DummyCTWithLongTag.dcm')['ID'] | |
| 3658 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 3659 | |
| 3660 tags = DoGet(_REMOTE, '/instances/%s/tags' % i) | |
| 3661 self.assertTrue('0018,1020' in tags) | |
| 3662 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name']) | |
| 3663 self.assertEqual('TooLong', tags['0018,1020']['Type']) | |
| 3664 self.assertEqual(None, tags['0018,1020']['Value']) | |
| 3665 | |
| 3666 tags = DoGet(_REMOTE, '/instances/%s/tags?ignore-length=0018-1020' % i) | |
| 3667 self.assertTrue('0018,1020' in tags) | |
| 3668 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name']) | |
| 3669 self.assertEqual('String', tags['0018,1020']['Type']) | |
| 3670 self.assertTrue(tags['0018,1020']['Value'].startswith('Lorem ipsum dolor sit amet')) | |
| 3671 | |
| 3672 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) | |
| 3673 self.assertTrue('SoftwareVersions' in tags) | |
| 3674 self.assertEqual(None, tags['SoftwareVersions']) | |
| 3675 self.assertTrue('HeartRate' in tags) | |
| 3676 self.assertEqual(474, int(tags['HeartRate'])) | |
| 3677 | |
| 3678 tags = DoGet(_REMOTE, '/instances/%s/simplified-tags' % i) | |
| 3679 self.assertTrue('SoftwareVersions' in tags) | |
| 3680 self.assertEqual(None, tags['SoftwareVersions']) | |
| 3681 | |
| 3682 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify&ignore-length=0018-1020' % i) | |
| 3683 self.assertTrue('SoftwareVersions' in tags) | |
| 3684 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet')) | |
| 3685 | |
| 3686 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify&ignore-length=SoftwareVersions' % i) | |
| 3687 self.assertTrue('SoftwareVersions' in tags) | |
| 3688 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet')) | |
| 3689 | |
| 3690 tags = DoGet(_REMOTE, '/series/%s/instances-tags' % series) | |
| 3691 self.assertEqual(1, len(tags)) | |
| 3692 self.assertTrue(i in tags.keys()) | |
| 3693 self.assertTrue('0018,1020' in tags[i]) | |
| 3694 self.assertEqual('TooLong', tags[i]['0018,1020']['Type']) | |
| 3695 | |
| 3696 tags = DoGet(_REMOTE, '/series/%s/instances-tags?ignore-length=SoftwareVersions' % series) | |
| 3697 self.assertEqual(1, len(tags)) | |
| 3698 self.assertTrue(i in tags.keys()) | |
| 3699 self.assertTrue('0018,1020' in tags[i]) | |
| 3700 self.assertEqual('String', tags[i]['0018,1020']['Type']) | |
| 3701 self.assertTrue(tags[i]['0018,1020']['Value'].startswith('Lorem ipsum dolor sit amet')) | |
| 3702 | |
|
127
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3703 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3704 def test_extended_media(self): |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3705 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3706 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3707 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
|
3708 self.assertEqual(2, len(z.namelist())) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3709 self.assertTrue('IMAGES/IM0' in z.namelist()) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3710 self.assertTrue('DICOMDIR' in z.namelist()) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3711 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3712 try: |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3713 os.remove('/tmp/DICOMDIR') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3714 except: |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3715 # The file does not exist |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3716 pass |
|
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 z.extract('DICOMDIR', '/tmp') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3719 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ], |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3720 stderr = subprocess.STDOUT).split('\n') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3721 self.assertEqual(5, len(a)) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3722 self.assertTrue(a[0].startswith('Warning')) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3723 self.assertEqual('BasicDirectory', a[1]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3724 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
|
3725 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
|
3726 self.assertEqual('', a[4]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3727 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3728 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ], |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3729 stderr = subprocess.STDOUT).split('\n') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3730 self.assertEqual(1, len(a)) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3731 self.assertEqual('', a[0]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3732 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3733 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3734 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
|
3735 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3736 # Check the presence of the series description (extended tag) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3737 self.assertTrue(re.search('T1W_aTSE', a) != None) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3738 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3739 os.remove('/tmp/DICOMDIR') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3740 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3741 |
|
132
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3742 def test_anonymize_relationships_1(self): |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3743 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3744 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
|
3745 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3746 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3747 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3748 '{}', |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3749 'application/json')['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3750 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3751 a = DoGet(_REMOTE, '/studies/%s/instances' % study) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3752 self.assertEqual(2, len(a)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3753 a1 = a[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3754 a2 = a[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3755 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3756 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3757 self.assertEqual(2, len(b)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3758 b1 = b[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3759 b2 = b[1]['ID'] |
|
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 SEQUENCE = '/instances/%s/content/ReferencedImageSequence' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3762 SOP = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPInstanceUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3763 CLASS = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPClassUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3764 FRAME = '/instances/%s/content/FrameOfReferenceUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3765 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3766 self.assertEqual(DoGet(_REMOTE, FRAME % a1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3767 DoGet(_REMOTE, FRAME % a2)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3768 self.assertEqual(DoGet(_REMOTE, FRAME % b1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3769 DoGet(_REMOTE, FRAME % b2)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3770 self.assertNotEqual(DoGet(_REMOTE, FRAME % a1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3771 DoGet(_REMOTE, FRAME % b1)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3772 self.assertNotEqual(DoGet(_REMOTE, FRAME % a2), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3773 DoGet(_REMOTE, FRAME % b2)) |
|
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 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
|
3776 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
|
3777 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
|
3778 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
|
3779 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3780 for i in range(3): |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3781 self.assertEqual(DoGet(_REMOTE, SOP % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3782 DoGet(_REMOTE, SOP % (a2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3783 self.assertEqual(DoGet(_REMOTE, SOP % (b1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3784 DoGet(_REMOTE, SOP % (b2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3785 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3786 DoGet(_REMOTE, SOP % (b1, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3787 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3788 DoGet(_REMOTE, SOP % (b2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3789 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3790 DoGet(_REMOTE, CLASS % (b1, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3791 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3792 DoGet(_REMOTE, CLASS % (b2, i))) |
|
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 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3795 def test_anonymize_relationships_2(self): |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3796 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm') |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3797 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
|
3798 study = '6c65289b-db2fcb71-7eaf73f4-8e12470c-a4d6d7cf' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3799 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3800 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3801 '{}', |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3802 'application/json')['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3803 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3804 a = DoGet(_REMOTE, '/studies/%s/instances' % study) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3805 self.assertEqual(2, len(a)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3806 a1 = a[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3807 a2 = a[1]['ID'] |
|
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 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3810 self.assertEqual(2, len(b)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3811 b1 = b[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3812 b2 = b[1]['ID'] |
|
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 SEQUENCE = '/instances/%s/content/SourceImageSequence' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3815 SOP = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPInstanceUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3816 CLASS = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPClassUID' |
|
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 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
|
3819 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
|
3820 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
|
3821 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
|
3822 self.assertEqual(DoGet(_REMOTE, SOP % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3823 DoGet(_REMOTE, SOP % (a2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3824 self.assertEqual(DoGet(_REMOTE, SOP % (b1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3825 DoGet(_REMOTE, SOP % (b2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3826 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3827 DoGet(_REMOTE, SOP % (b1, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3828 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3829 DoGet(_REMOTE, SOP % (b2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3830 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3831 DoGet(_REMOTE, CLASS % (b1, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3832 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3833 DoGet(_REMOTE, CLASS % (b2, 0))) |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3834 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3835 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3836 def test_anonymize_relationships_3(self): |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3837 sr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM0')['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3838 mr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM631')['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3839 study = 'ef351eb2-c1147229-062736b8-35a151e3-e32d526b' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3840 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3841 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3842 { "Keep" : [ "ContentSequence" ] }) ['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3843 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3844 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3845 self.assertEqual(2, len(a)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3846 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3847 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
|
3848 sr2 = a[0]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3849 mr2 = a[1]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3850 else: |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3851 sr2 = a[1]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3852 mr2 = a[0]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3853 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3854 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % sr1), |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3855 DoGet(_REMOTE, '/instances/%s/content/Modality' % sr2)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3856 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % mr1), |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3857 DoGet(_REMOTE, '/instances/%s/content/Modality' % mr2)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3858 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3859 mrUid1 = DoGet(_REMOTE, '/instances/%s' % mr1)['MainDicomTags']['SOPInstanceUID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3860 mrUid2 = DoGet(_REMOTE, '/instances/%s' % mr2)['MainDicomTags']['SOPInstanceUID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3861 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
|
3862 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
|
3863 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
|
3864 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
|
3865 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3866 PATH1 = '/instances/%s/content/CurrentRequestedProcedureEvidenceSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3867 PATH2 = PATH1 + '/0/ReferencedSeriesSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3868 PATH3 = PATH2 + '/0/ReferencedSOPSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3869 PATH4 = PATH3 + '/0/ReferencedSOPInstanceUID' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3870 PATH5 = PATH3 + '/0/ReferencedSOPClassUID' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3871 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3872 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3873 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3874 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3875 self.assertEqual(DoGet(_REMOTE, PATH4 % sr1), mrUid1) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3876 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
|
3877 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
|
3878 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3879 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3880 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3881 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3882 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
|
3883 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3884 self.assertEqual(mrUid2, DoGet(_REMOTE, PATH4 % sr2).strip('\x00')) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3885 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
|
3886 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
|
3887 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3888 content1 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr1) ['ContentSequence'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3889 content2 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr2) ['ContentSequence'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3890 self.assertEqual(str(content1), str(content2)) |
|
141
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3891 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3892 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3893 def test_bitbucket_issue_94(self): |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3894 # "a simple instance modification should not modify FrameOfReferenceUID + ..." |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3895 # https://bitbucket.org/sjodogne/orthanc/issues/94 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3896 i = UploadInstance(_REMOTE, 'Issue94.dcm')['ID'] |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3897 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3898 source = DoGet(_REMOTE, '/instances/%s/attachments/dicom/data' % i) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3899 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3900 modified = DoPost(_REMOTE, '/instances/%s/modify' % i, |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3901 { "Replace" : {"PatientID" : "toto"}, "Force": True}) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3902 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3903 anonymized = DoPost(_REMOTE, '/instances/%s/anonymize' % i) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3904 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3905 a = ExtractDicomTags(source, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3906 self.assertEqual(1, len(a)) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3907 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3908 b = ExtractDicomTags(modified, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3909 self.assertEqual(1, len(b)) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3910 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3911 c = ExtractDicomTags(anonymized, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3912 self.assertEqual(1, len(c)) |
|
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 self.assertEqual(a, b) # Modified DICOM |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3915 self.assertNotEqual(a, c) # Anonymized DICOM |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3916 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3917 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3918 def test_metadata_origin(self): |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3919 # Upload using the REST API |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3920 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
|
3921 self.assertEqual('RestApi', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3922 self.assertEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3923 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3924 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
|
3925 self.assertEqual('alice', DoGet(_REMOTE, '/instances/%s/metadata/HttpUsername' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3926 |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3927 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3928 self.assertEqual('RestApi', m['Origin']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3929 self.assertEqual('', m['RemoteAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3930 self.assertNotEqual('', m['RemoteIP']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3931 self.assertFalse('CalledAET' in m) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3932 self.assertEqual('alice', m['HttpUsername']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3933 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3934 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
|
3935 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
|
3936 self.assertEqual('1', m['IndexInSeries']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3937 self.assertTrue('ReceptionDate' in m) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3938 |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3939 DoDelete(_REMOTE, '/instances/%s' % i) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3940 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3941 # Upload using the DICOM protocol |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3942 subprocess.check_call([ FindExecutable('storescu'), |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3943 _REMOTE['Server'], str(_REMOTE['DicomPort']), |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3944 GetDatabasePath('Knee/T1/IM-0001-0001.dcm'), |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3945 '-xw' ]) # Propose JPEG2000 |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3946 self.assertEqual('DicomProtocol', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3947 self.assertEqual('STORESCU', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3948 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3949 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
|
3950 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
|
3951 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3952 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3953 self.assertEqual('DicomProtocol', m['Origin']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3954 self.assertEqual('STORESCU', m['RemoteAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3955 self.assertNotEqual('', m['RemoteIP']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3956 self.assertEqual('ANY-SCP', m['CalledAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3957 self.assertFalse('HttpUsername' in m) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3958 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3959 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
|
3960 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
|
3961 self.assertEqual('1', m['IndexInSeries']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3962 self.assertTrue('ReceptionDate' in m) |
| 147 | 3963 |
| 3964 | |
| 3965 def test_lua_deadlock(self): | |
| 3966 # Rana Asim Wajid (2018-07-14): "It does seem that the issue | |
| 3967 # is with the lua script I'm using for conversion of images to | |
| 3968 # JPEG2000. When the script is used with 1.4.0 the first | |
| 3969 # instance appears to be stored and then everything just | |
| 3970 # halts, ie Orthanc wont respond to anything after that." | |
| 3971 # https://groups.google.com/d/msg/orthanc-users/Rc-Beb42xc8/JUgdzrmCAgAJ | |
| 174 | 3972 InstallLuaScriptFromPath(_REMOTE, 'Lua/Jpeg2000Conversion.lua') |
| 147 | 3973 |
| 3974 subprocess.check_call([ FindExecutable('storescu'), | |
| 3975 _REMOTE['Server'], str(_REMOTE['DicomPort']), | |
| 3976 GetDatabasePath('Brainix/Flair/IM-0001-0001.dcm'), | |
| 3977 GetDatabasePath('Brainix/Flair/IM-0001-0002.dcm'), | |
| 3978 ]) | |
| 3979 | |
| 3980 instances = DoGet(_REMOTE, '/instances') | |
| 3981 self.assertEqual(2, len(instances)) | |
| 3982 | |
| 3983 t1 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[0]) | |
| 3984 t2 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[1]) | |
| 175 | 3985 self.assertEqual('1.2.840.10008.1.2.4.90', t1) # this will fail if libgdcm-tools is not installed |
| 147 | 3986 self.assertEqual(t1, t2); |
|
154
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
3987 |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
3988 |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
3989 def test_find_group_length(self): |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
3990 # 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
|
3991 # one of the Generic Group Length tags (*, 0x0000) |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
3992 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
|
3993 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
|
3994 self.assertFalse('UnableToProcess' in result) |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
3995 self.assertFalse('E:' in result) |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3996 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3997 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3998 def test_split(self): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3999 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4000 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4001 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4002 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4003 t2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4004 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4005 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4006 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4007 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4008 info = DoGet(_REMOTE, '/studies/%s' % study) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4009 self.assertTrue('ReferringPhysicianName' in info['MainDicomTags']) |
|
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 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4012 (_REMOTE, '/studies/%s/split' % study, { |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4013 'Series' : [ t2 ], |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4014 'Replace' : { 'PatientName' : 'Hello' }, |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4015 'Remove' : [ 'ReferringPhysicianName' ], |
| 181 | 4016 'KeepSource' : False, |
| 4017 'Asynchronous' : True | |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4018 })) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4019 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4020 self.assertNotEqual(None, job) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4021 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4022 studies = set(DoGet(_REMOTE, '/studies')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4023 self.assertEqual(2, len(studies)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4024 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4025 series = set(DoGet(_REMOTE, '/series')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4026 self.assertEqual(2, len(series)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4027 self.assertTrue(t1 in series) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4028 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4029 study2 = DoGet(_REMOTE, '/jobs/%s' % job)['Content']['TargetStudy'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4030 self.assertTrue(study in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4031 self.assertTrue(study2 in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4032 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4033 info = DoGet(_REMOTE, '/studies/%s' % study2) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4034 self.assertTrue('Hello', info['PatientMainDicomTags']['PatientName']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4035 self.assertFalse('ReferringPhysicianName' in info['MainDicomTags']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4036 |
|
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 def test_merge(self): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4039 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4040 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4041 knee = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4042 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4043 brainix = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4044 flair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4045 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4046 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4047 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
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 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4050 (_REMOTE, '/studies/%s/merge' % knee, { |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4051 'Resources' : [ brainix ], |
| 181 | 4052 'KeepSource' : True, |
| 4053 'Synchronous' : False | |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4054 })) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4055 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4056 self.assertNotEqual(None, job) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4057 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4058 studies = set(DoGet(_REMOTE, '/studies')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4059 self.assertEqual(2, len(studies)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4060 self.assertTrue(knee in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4061 self.assertTrue(brainix in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4062 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4063 series = set(DoGet(_REMOTE, '/studies/%s' % knee)['Series']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4064 self.assertTrue(t1 in series) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4065 series.remove(t1) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4066 self.assertEqual(1, len(series)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4067 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4068 instances = DoGet(_REMOTE, '/series/%s' % list(series)[0])['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4069 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4070 merged = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4071 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4072 instances = DoGet(_REMOTE, '/series/%s' % t1)['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4073 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4074 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
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 instances = DoGet(_REMOTE, '/series/%s' % flair)['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4077 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4078 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4079 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4080 tags = DoGet(_REMOTE, '/studies/%s' % knee) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4081 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4082 for key in tags['PatientMainDicomTags']: |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4083 self.assertEqual(a[key], merged[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4084 if (key in b and key != 'PatientSex'): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4085 self.assertNotEqual(a[key], b[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4086 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4087 for key in tags['MainDicomTags']: |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4088 # Not in the patient/study module |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4089 if (not key in [ 'InstitutionName', |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4090 'RequestingPhysician', |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4091 'RequestedProcedureDescription', ]): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4092 self.assertEqual(a[key], merged[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4093 if (key in b): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4094 self.assertNotEqual(a[key], b[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
4095 |
| 187 | 4096 |
| 4097 def test_async_archive(self): | |
| 4098 # Testing the asynchronous generation of archives/medias (new | |
| 4099 # in Orthanc 1.4.3) | |
| 4100 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 4101 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 4102 | |
| 4103 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' | |
| 4104 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' | |
| 4105 | |
| 4106 job = MonitorJob2(_REMOTE, lambda: DoPost | |
| 4107 (_REMOTE, '/studies/%s/archive' % kneeT1, { | |
| 4108 'Synchronous' : False | |
| 4109 })) | |
| 4110 | |
| 4111 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) | |
| 4112 self.assertEqual(1, len(z.namelist())) | |
| 4113 self.assertFalse('DICOMDIR' in z.namelist()) | |
| 4114 | |
| 4115 job2 = MonitorJob2(_REMOTE, lambda: DoPost | |
| 4116 (_REMOTE, '/studies/%s/media' % kneeT1, { | |
| 4117 'Synchronous' : False | |
| 4118 })) | |
| 4119 | |
| 4120 # The archive from the first job has been replaced by the | |
| 4121 # archive from second job (as MediaArchiveSize == 1) | |
| 4122 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job)) | |
| 4123 | |
| 4124 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job2) | |
| 4125 self.assertEqual(2, len(z.namelist())) | |
| 4126 self.assertTrue('DICOMDIR' in z.namelist()) | |
| 4127 | |
| 4128 job = MonitorJob2(_REMOTE, lambda: DoPost | |
| 4129 (_REMOTE, '/tools/create-archive', { | |
| 4130 'Synchronous' : False, | |
| 4131 'Resources' : [ kneeT1, kneeT2 ], | |
| 4132 })) | |
| 4133 | |
| 4134 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) | |
| 4135 self.assertEqual(2, len(z.namelist())) | |
| 4136 self.assertFalse('DICOMDIR' in z.namelist()) | |
| 4137 | |
| 4138 job = MonitorJob2(_REMOTE, lambda: DoPost | |
| 4139 (_REMOTE, '/tools/create-media', { | |
| 4140 'Synchronous' : False, | |
| 4141 'Resources' : [ kneeT1, kneeT2 ], | |
| 4142 })) | |
| 4143 | |
| 4144 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) | |
| 4145 self.assertEqual(3, len(z.namelist())) | |
| 4146 self.assertTrue('DICOMDIR' in z.namelist()) | |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4147 |
| 187 | 4148 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4149 def test_queries_hierarchy(self): |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4150 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4151 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
|
4152 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4153 tags = { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4154 'NumberOfPatientRelatedInstances' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4155 'NumberOfPatientRelatedSeries' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4156 'NumberOfPatientRelatedStudies' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4157 'NumberOfStudyRelatedInstances' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4158 'NumberOfStudyRelatedSeries' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4159 'NumberOfSeriesRelatedInstances' : '', |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4160 } |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4161 |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4162 tags2 = copy.copy(tags) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4163 tags2['PatientID'] = '887' # Only consider the "Knee" patient |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4164 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4165 patient = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4166 'Level' : 'Patient', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4167 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4168 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4169 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4170 study = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4171 'Level' : 'Study', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4172 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4173 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4174 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4175 series = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4176 'Level' : 'Series', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4177 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4178 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4179 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4180 instance = DoPost(_REMOTE, '/modalities/self/query', { |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4181 'Level' : 'Instance', |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4182 'Query' : tags2 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4183 }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4184 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4185 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
|
4186 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4187 self.assertEqual('887', p[0]['PatientID']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4188 self.assertEqual('1', p[0]['NumberOfPatientRelatedInstances']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4189 self.assertEqual('1', p[0]['NumberOfPatientRelatedSeries']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4190 self.assertEqual('1', p[0]['NumberOfPatientRelatedStudies']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4191 self.assertFalse('NumberOfStudyRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4192 self.assertFalse('NumberOfStudyRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4193 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4194 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4195 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
|
4196 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4197 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
|
4198 self.assertEqual('1', p[0]['NumberOfStudyRelatedInstances']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4199 self.assertEqual('1', p[0]['NumberOfStudyRelatedSeries']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4200 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4201 self.assertFalse('NumberOfPatientRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4202 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4203 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4204 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4205 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
|
4206 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4207 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
|
4208 self.assertEqual('1', p[0]['NumberOfSeriesRelatedInstances']) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4209 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4210 self.assertFalse('NumberOfPatientRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4211 self.assertFalse('NumberOfPatientRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4212 self.assertFalse('NumberOfStudyRelatedInstances' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4213 self.assertFalse('NumberOfStudyRelatedSeries' in p[0]) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4214 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4215 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
|
4216 self.assertEqual(1, len(p)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4217 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
|
4218 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4219 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
|
4220 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4221 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
|
4222 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % study)) |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4223 |
|
188
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4224 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
|
4225 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4226 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
|
4227 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4228 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4229 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
|
4230 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4231 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
|
4232 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4233 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4234 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
|
4235 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4236 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
|
4237 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4238 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4239 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
|
4240 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4241 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
|
4242 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4243 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4244 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
|
4245 { 'Query' : tags }) ['ID'] |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4246 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
|
4247 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance)) |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4248 |
|
7d585263808b
new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
4249 |
|
189
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4250 def test_dicom_disk_size(self): |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4251 dicomSize = 0 |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4252 |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4253 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4254 |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4255 for i in range(2): |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4256 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
|
4257 UploadInstance(_REMOTE, p) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4258 dicomSize += os.path.getsize(GetDatabasePath(p)) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4259 |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4260 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
|
4261 self.assertEqual(2, s['CountInstances']) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4262 self.assertEqual(2, s['CountSeries']) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4263 self.assertEqual(1, s['CountStudies']) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4264 self.assertEqual(dicomSize, int(s['DicomDiskSize'])) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4265 self.assertEqual(dicomSize, int(s['DicomUncompressedSize'])) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4266 self.assertLess(dicomSize, int(s['UncompressedSize'])) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4267 self.assertEqual(s['UncompressedSize'], s['DiskSize']) |
|
11719f19bd62
test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
4268 |
|
202
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4269 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4270 def test_changes_2(self): |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4271 # 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
|
4272 # 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
|
4273 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4274 # 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
|
4275 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
|
4276 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
|
4277 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
|
4278 DoDelete(_REMOTE, '/instances/%s' % a) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4279 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4280 # 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
|
4281 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
|
4282 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4283 c = DoGet(_REMOTE, '/changes') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4284 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
|
4285 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4286 seq = c['Last'] |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4287 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4288 c = DoGet(_REMOTE, '/changes?last') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4289 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
|
4290 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4291 self.assertEqual(seq, c['Last']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4292 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4293 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
|
4294 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
|
4295 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4296 self.assertEqual(seq, c['Last']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4297 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4298 # Add one instance |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4299 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4300 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
|
4301 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4302 c = DoGet(_REMOTE, '/changes') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4303 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
|
4304 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4305 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
|
4306 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4307 c = DoGet(_REMOTE, '/changes?last') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4308 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
|
4309 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4310 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
|
4311 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4312 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
|
4313 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
|
4314 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4315 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
|
4316 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4317 # Remove the uploaded instance |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4318 DoDelete(_REMOTE, '/instances/%s' % a) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4319 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
|
4320 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4321 c = DoGet(_REMOTE, '/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(c['Changes'])) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4323 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4324 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
|
4325 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4326 c = DoGet(_REMOTE, '/changes?last') |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4327 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
|
4328 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4329 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
|
4330 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4331 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
|
4332 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
|
4333 self.assertTrue(c['Done']) |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4334 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
|
4335 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4336 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4337 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
|
4338 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
|
4339 |
|
f26f9ae9c599
test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
195
diff
changeset
|
4340 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
|
4341 self.assertEqual(2, len(z.namelist())) |
|
207
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4342 |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4343 |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4344 def test_invalid_findscp(self): |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4345 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
a515eec74078
test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
202
diff
changeset
|
4346 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
|
4347 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
|
4348 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4349 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4350 def test_bitbucket_issue_90(self): |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4351 def CountDicomResults(sex): |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4352 a = CallFindScu([ '-S', '-k', '8,52=STUDY', '-k', sex ]) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4353 return len(re.findall('\(0010,0040\)', a)) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4354 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4355 def CountRestResults(sex): |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4356 a = DoPost(_REMOTE, '/tools/find', |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4357 { 'Level' : 'Study', 'Query' : { 'PatientSex' : sex } }) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4358 return len(a) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4359 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4360 # 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
|
4361 # "DummyCT.dcm" has the tag PatientSex (0010,0040) unset |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4362 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4363 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4364 # 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
|
4365 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4366 # 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
|
4367 self.assertEqual(0, CountDicomResults('PatientSex=*')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4368 self.assertEqual(0, CountRestResults('*')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4369 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4370 # 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
|
4371 self.assertEqual(0, CountDicomResults('PatientSex=F')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4372 self.assertEqual(0, CountDicomResults('PatientSex=M')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4373 self.assertEqual(0, CountRestResults('F')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4374 self.assertEqual(0, CountRestResults('M')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4375 |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4376 # 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
|
4377 # 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
|
4378 # as a filter in such a situation. |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4379 self.assertEqual(1, CountDicomResults('PatientSex')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4380 self.assertEqual(1, CountDicomResults('PatientSex=')) |
|
2444c9a7c422
test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
207
diff
changeset
|
4381 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
|
4382 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4383 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4384 def test_rest_modalities_in_study(self): |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4385 # 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
|
4386 # 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
|
4387 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4388 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4389 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4390 'Query' : { 'ModalitiesInStudy' : 'US' }}) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4391 self.assertEqual(0, len(a)) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4392 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4393 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4394 'Query' : { 'ModalitiesInStudy' : 'US\\CT' }}) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4395 self.assertEqual(1, len(a)) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4396 |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4397 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4398 'Query' : { 'ModalitiesInStudy' : 'CT' }}) |
|
2c50c8f340c2
test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
208
diff
changeset
|
4399 self.assertEqual(1, len(a)) |
| 211 | 4400 |
| 4401 | |
| 4402 def test_series_status(self): | |
| 4403 def HasCompletedInChanges(): | |
| 4404 for c in DoGet(_REMOTE, '/changes?limit=1000&since=0')['Changes']: | |
| 4405 if c['ChangeType'] == 'CompletedSeries': | |
| 4406 return True; | |
| 4407 | |
| 4408 return False | |
| 4409 | |
| 4410 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm') | |
| 4411 series = '8ea120d7-5057d919-837dfbcc-ccd04e0f-7f3a94aa' | |
| 4412 self.assertEqual('Unknown', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 4413 self.assertFalse(HasCompletedInChanges()) | |
| 4414 | |
| 4415 series = 'ce25ecb6-ed79d004-5ae43ca7-3fc89bc5-67511614' | |
| 4416 | |
| 4417 for i in range(3): | |
| 4418 UploadInstance(_REMOTE, 'Series/Lena-%d.dcm' % (i + 1)) | |
| 4419 self.assertEqual('Missing', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 4420 self.assertFalse(HasCompletedInChanges()) | |
| 4421 | |
| 4422 UploadInstance(_REMOTE, 'Series/Lena-4.dcm') | |
| 4423 self.assertEqual('Complete', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 4424 self.assertTrue(HasCompletedInChanges()) | |
| 4425 | |
| 4426 DoDelete(_REMOTE, '/changes') | |
| 4427 self.assertFalse(HasCompletedInChanges()) | |
| 4428 | |
| 4429 UploadInstance(_REMOTE, 'Series/Lena-5.dcm') | |
| 4430 self.assertEqual('Inconsistent', DoGet(_REMOTE, '/series/%s' % series)['Status']) | |
| 4431 self.assertFalse(HasCompletedInChanges()) | |
| 4432 | |
| 215 | 4433 |
| 4434 def test_dicomweb(self): | |
| 4435 def Compare(dicom, reference): | |
| 4436 a = UploadInstance(_REMOTE, dicom) ['ID'] | |
| 4437 b = DoGet(_REMOTE, '/instances/%s/file' % a, | |
| 4438 headers = { 'Accept' : 'application/dicom+json' }) | |
| 4439 with open(GetDatabasePath(reference), 'rb') as c: | |
| 4440 d = json.load(c) | |
| 220 | 4441 AssertAlmostEqualRecursive(self, d, b) |
| 215 | 4442 |
| 4443 Compare('DummyCT.dcm', 'DummyCT.json') | |
| 4444 Compare('MarekLatin2.dcm', 'MarekLatin2.json') | |
| 4445 Compare('HierarchicalAnonymization/StructuredReports/IM0', | |
| 4446 'HierarchicalAnonymization/StructuredReports/IM0.json') | |
| 217 | 4447 |
| 4448 | |
| 4449 def test_issue_95_encodings(self): | |
| 4450 # https://bitbucket.org/sjodogne/orthanc/issues/95/server-cant-support-chinese | |
| 4451 # Check out image: "../Database/Encodings/DavidClunie/charsettests.screenshot.png" | |
| 4452 | |
| 4453 # Very useful tool: "file2" from package "file-kanji" | |
| 4454 | |
| 4455 def GetPatientName(dicom): | |
| 4456 i = UploadInstance(_REMOTE, dicom) ['ID'] | |
| 4457 j = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) | |
| 4458 return j['PatientName'] | |
| 4459 | |
| 4460 def ComparePatientName(name, dicom): | |
| 4461 self.assertEqual(name, GetPatientName(dicom)) | |
| 4462 | |
| 4463 # gdcmraw -t 10,10 -i SCSFREN -o /tmp/tag && uconv -f ISO-IR-100 -t UTF-8 /tmp/tag && echo | |
| 4464 ComparePatientName(u'Buc^Jérôme', 'Encodings/DavidClunie/SCSFREN') | |
| 4465 | |
| 4466 # gdcmraw -t 10,10 -i SCSI2 -o /tmp/tag && uconv -f KOREAN -t UTF-8 /tmp/tag && echo | |
| 4467 ComparePatientName(u'Hong^Gildong=洪^吉洞=홍^길동', 'Encodings/DavidClunie/SCSI2') # Since Orthanc 1.5.5 | |
| 4468 | |
| 4469 # gdcmraw -t 10,10 -i SCSX2 -o /tmp/tag && uconv -f GB18030 -t UTF-8 /tmp/tag && echo | |
| 4470 ComparePatientName(u'Wang^XiaoDong=王^小东=', 'Encodings/DavidClunie/SCSX2') | |
| 4471 | |
| 4472 # gdcmraw -t 10,10 -i SCSX1 -o /tmp/tag && cat /tmp/tag && echo | |
| 4473 ComparePatientName(u'Wang^XiaoDong=王^小東=', 'Encodings/DavidClunie/SCSX1') | |
| 4474 | |
| 4475 # gdcmraw -t 10,10 -i SCSH31 -o /tmp/tag && uconv -f JIS -t UTF-8 /tmp/tag && echo | |
| 4476 ComparePatientName(u'Yamada^Tarou=山田^太郎=やまだ^たろう', 'Encodings/DavidClunie/SCSH31') | |
| 4477 | |
| 4478 # gdcmraw -t 10,10 -i SCSGERM -o /tmp/tag && uconv -f ISO-IR-100 -t UTF-8 /tmp/tag && echo | |
| 4479 ComparePatientName(u'Äneas^Rüdiger', 'Encodings/DavidClunie/SCSGERM') | |
| 4480 | |
| 4481 # gdcmraw -t 10,10 -i SCSGREEK -o /tmp/tag && uconv -f ISO-IR-126 -t UTF-8 /tmp/tag && echo | |
| 4482 ComparePatientName(u'Διονυσιος', 'Encodings/DavidClunie/SCSGREEK') | |
| 4483 | |
| 4484 # gdcmraw -t 10,10 -i SCSRUSS -o /tmp/tag && uconv -f ISO-IR-144 -t UTF-8 /tmp/tag && echo | |
| 4485 ComparePatientName(u'Люкceмбypг', 'Encodings/DavidClunie/SCSRUSS') | |
| 4486 | |
| 4487 # gdcmraw -t 10,10 -i SCSHBRW -o /tmp/tag && uconv -f ISO-IR-138 -t UTF-8 /tmp/tag && echo | |
| 4488 # NB: Hebrew is a right-to-left encoding, copying/pasting from | |
| 4489 # Linux console into Emacs automatically reverse the string | |
| 4490 ComparePatientName(u'שרון^דבורה', 'Encodings/DavidClunie/SCSHBRW') | |
| 4491 | |
| 4492 # gdcmraw -t 10,10 -i SCSARAB -o /tmp/tag && uconv -f ISO-IR-127 -t UTF-8 /tmp/tag && echo | |
| 4493 # NB: Right-to-left as for Hebrew (SCSHBRW), and the Ubuntu console can't display such | |
| 4494 # characters by default, but copy/paste works with Emacs | |
| 4495 ComparePatientName(u'قباني^لنزار', 'Encodings/DavidClunie/SCSARAB') | |
| 4496 | |
| 4497 # SCSH32: This SpecificCharacterSet is composed of 2 | |
| 4498 # codepages: "ISO 2022 IR 13" (i.e. "SHIFT_JIS") until the | |
| 4499 # first equal, then "ISO 2022 IR 87" (i.e. "JIS") for the | |
| 4500 # remainer. Orthanc only takes into consideration the first | |
| 4501 # codepage: This is a limitation. | |
| 4502 # gdcmraw -t 10,10 -i SCSH32 -o /tmp/tag && cut -d '=' -f 1 /tmp/tag | uconv -f SHIFT_JIS -t UTF-8 | |
| 4503 self.assertTrue(GetPatientName('Encodings/DavidClunie/SCSH32').startswith(u'ﾔﾏﾀﾞ^ﾀﾛｳ=')) | |
|
218
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4504 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4505 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4506 def test_findscu_missing_tags(self): |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4507 # dcmodify -e Rows DummyCTInvalidRows.dcm -gst -gse -gin |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4508 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4509 UploadInstance(_REMOTE, 'DummyCTInvalidRows.dcm') |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4510 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4511 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
|
4512 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4513 # We have 2 instances... |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4514 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4515 self.assertEqual(2, len(patientNames)) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4516 self.assertEqual('KNIX', patientNames[0]) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4517 self.assertEqual('KNIX', patientNames[1]) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4518 |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4519 # ...but only 1 value for the "Rows" tag |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4520 rows = re.findall('\(0028,0010\) US ([0-9]+)', i) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4521 self.assertEqual(1, len(rows)) |
|
70fba41776be
test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
217
diff
changeset
|
4522 self.assertEqual('512', rows[0]) |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4523 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4524 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4525 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4526 def test_bitbucket_issue_131(self): |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4527 # "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
|
4528 # StudyInstanceUID in it's database." |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4529 # 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
|
4530 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4531 # Insert 2 instances, with the same StudyInstanceUID, but with |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4532 # different patient IDs. Orthanc will create 2 distincts |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4533 # patients, and the hierarchy of resources above the two |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4534 # instances will be fully disjoint. |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4535 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-a.dcm') |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4536 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-b.dcm') |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4537 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4538 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4539 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4540 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4541 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4542 'Level' : 'Study', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4543 'Query' : {"PatientID": "A" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4544 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4545 # 1 study is matched |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4546 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
|
4547 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4548 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 4549 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 4550 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 4551 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4552 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4553 # 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
|
4554 # 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
|
4555 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4556 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4557 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4558 # Match the 2 studies |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4559 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4560 'Level' : 'Study', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4561 'Query' : {"StudyInstanceUID": "2.25.123" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4562 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
|
4563 DropOrthanc(_LOCAL) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4564 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 4565 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 4566 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 4567 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4568 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4569 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4570 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4571 # 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
|
4572 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4573 'Level' : 'Patient', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4574 'Query' : {"PatientID": "A" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4575 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
|
4576 DropOrthanc(_LOCAL) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4577 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 4578 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 4579 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 4580 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4581 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4582 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4583 |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4584 # 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
|
4585 a = DoPost(_REMOTE, '/modalities/self/query', { |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4586 'Level' : 'Series', |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4587 'Query' : {"PatientID": "A" }})['ID'] |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4588 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
|
4589 DropOrthanc(_LOCAL) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4590 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
| 220 | 4591 WaitAllNewJobsDone(_REMOTE, lambda: DoPost |
| 4592 (_REMOTE, '/queries/%s/retrieve' % a, | |
| 4593 '{"TargetAet":"ORTHANCTEST","Synchronous":false}')) | |
|
219
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4594 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
00e5aeea33dd
test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
218
diff
changeset
|
4595 |