Mercurial > hg > orthanc-tests
annotate Tests/Tests.py @ 179:8a2dd77d4035
testing split/merge
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 01 Oct 2018 17:54:32 +0200 |
| parents | ef6b791c6d62 |
| children | 911070f790e3 |
| 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 |
|
130
50cd127e5330
upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
128
diff
changeset
|
8 # Copyright (C) 2017-2018 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 | |
| 14 | 24 import tempfile |
| 3 | 25 import unittest |
| 36 | 26 import base64 |
| 3 | 27 |
| 11 | 28 from PIL import ImageChops |
| 3 | 29 from Toolbox import * |
| 13 | 30 from xml.dom import minidom |
| 3 | 31 |
| 32 _LOCAL = None | |
| 33 _REMOTE = None | |
| 34 | |
| 35 | |
| 36 def SetOrthancParameters(local, remote): | |
| 37 global _LOCAL, _REMOTE | |
| 38 _LOCAL = local | |
| 39 _REMOTE = remote | |
| 40 | |
| 41 | |
| 14 | 42 def ExtractDicomTags(rawDicom, tags): |
| 43 with tempfile.NamedTemporaryFile(delete = True) as f: | |
| 44 f.write(rawDicom) | |
| 45 f.flush() | |
| 45 | 46 data = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ]) |
| 14 | 47 |
| 48 result = [] | |
| 49 for tag in tags: | |
| 50 match = re.search('<element[^>]+name="%s">([^>]*)</element>' % tag, data) | |
| 51 if match == None: | |
| 52 result.append('') | |
| 53 else: | |
| 54 result.append(match.group(1)) | |
| 55 | |
| 56 return result | |
| 57 | |
| 58 | |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
59 def CompareLists(a, b): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
60 if len(a) != len(b): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
61 return False |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
62 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
63 for i in range(len(a)): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
64 d = a[i] - b[i] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
65 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
|
66 return False |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
67 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
68 return True |
|
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 |
|
80
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
71 def CompareTags(a, b, tagsToIgnore): |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
72 for i in tagsToIgnore: |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
73 if i in a: |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
74 del a[i] |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
75 if i in b: |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
76 del b[i] |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
77 |
| 123 | 78 if a.keys() == b.keys(): |
| 79 return True | |
| 80 else: | |
| 81 print('Mismatch in tags: %s' % str(set(a.keys()) ^ set(b.keys()))) | |
| 82 return False | |
|
80
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
83 |
|
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
84 |
|
71
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
85 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
|
86 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
|
87 '-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
|
88 _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
|
89 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
|
90 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
|
91 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
92 |
| 142 | 93 def GetMoveScuCommand(): |
| 94 return [ | |
| 95 FindExecutable('movescu'), | |
| 96 '--move', _LOCAL['DicomAet'], # Target AET (i.e. storescp) | |
| 97 '--call', _REMOTE['DicomAet'], # Called AET (i.e. Orthanc) | |
| 98 '--aetitle', _LOCAL['DicomAet'], # Calling AET (i.e. storescp) | |
| 99 _REMOTE['Server'], | |
| 100 str(_REMOTE['DicomPort']) | |
| 101 ] | |
| 102 | |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
103 def CallMoveScu(args): |
| 142 | 104 subprocess.check_call(GetMoveScuCommand() + args, |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
105 stderr=subprocess.PIPE) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
106 |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
107 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
108 |
|
51
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
109 def GenerateTestSequence(): |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
110 return [ |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
111 { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
112 'StudyDescription': 'Hello^', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
113 'ReferencedStudySequence' : [ |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
114 { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
115 'StudyDescription': 'Toto', |
|
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 { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
118 'StudyDescription': 'Tata', |
|
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 ] |
|
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 'StudyDescription': 'Sébastien^', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
124 'StudyDate' : '19700202', |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
125 } |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
126 ] |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
127 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
128 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
129 |
| 15 | 130 |
| 3 | 131 class Orthanc(unittest.TestCase): |
| 132 def setUp(self): | |
| 83 | 133 if (sys.version_info >= (3, 0)): |
| 134 # Remove annoying warnings about unclosed socket in Python 3 | |
| 135 import warnings | |
| 136 warnings.simplefilter("ignore", ResourceWarning) | |
| 137 | |
| 3 | 138 DropOrthanc(_LOCAL) |
| 139 DropOrthanc(_REMOTE) | |
| 174 | 140 UninstallLuaCallbacks(_REMOTE) |
| 45 | 141 #print "In test", self._testMethodName |
|
44
ffa542cce638
Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
142 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
143 def AssertSameImages(self, truth, url): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
144 im = GetImage(_REMOTE, url) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
145 self.assertTrue(CompareLists(truth, im.getdata())) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
146 |
| 3 | 147 |
| 148 def test_system(self): | |
| 177 | 149 self.assertTrue('Version' in DoGet(_REMOTE, '/system')) |
| 150 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 151 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 152 | |
| 153 systemInfo = DoGet(_REMOTE, '/system') | |
| 154 if systemInfo["Version"] == "mainline": | |
| 155 print "Skipping version checks since you're currently in mainline" | |
| 156 return | |
| 157 | |
| 173 | 158 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 8, 6)) |
| 159 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 8, 7)) | |
| 160 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 7, 6)) | |
| 161 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 9, 6)) | |
| 162 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 1, 8, 6)) | |
| 3 | 163 |
| 164 def test_upload(self): | |
| 173 | 165 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) |
| 166 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 167 | |
| 168 sizeDummyCT = 2472 | |
| 169 sizeOverwrite = 2476 | |
| 170 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d' | |
| 171 | |
| 3 | 172 u = UploadInstance(_REMOTE, 'DummyCT.dcm') |
| 173 self.assertEqual('Success', u['Status']) | |
| 173 | 174 |
| 175 j = int(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % instance)) | |
| 176 s = sizeDummyCT + j | |
| 177 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 178 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 179 | |
| 3 | 180 u = UploadInstance(_REMOTE, 'DummyCT.dcm') |
| 181 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 182 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 183 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 184 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 173 | 185 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalDiskSize']) |
| 186 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 187 | |
| 188 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance) | |
| 3 | 189 self.assertEqual('20070101', i['StudyDate']) |
| 173 | 190 self.assertEqual('KNIX', i['PatientName']) |
| 191 | |
| 192 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2): | |
| 193 # Overwriting | |
| 194 self.assertEqual('Success', u['Status']) | |
| 195 else: | |
| 196 self.assertEqual('AlreadyStored', u['Status']) | |
| 197 | |
| 198 u = UploadInstance(_REMOTE, 'DummyCT-overwrite.dcm') | |
| 199 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 200 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 201 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 202 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 203 | |
| 204 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2): | |
| 205 # Overwriting | |
| 206 self.assertEqual('Success', u['Status']) | |
| 207 j2 = int(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % instance)) | |
| 208 s2 = sizeOverwrite + j2 | |
| 209 self.assertNotEqual(s, s2) | |
| 210 self.assertNotEqual(j, j2) | |
| 211 self.assertEqual('%d' % s2, DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 212 self.assertEqual('%d' % s2, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 213 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance) | |
| 214 self.assertEqual('ANOTHER', i['PatientName']) | |
| 215 else: | |
| 216 self.assertEqual('AlreadyStored', u['Status']) | |
| 217 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 218 self.assertEqual('%d' % s, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 3 | 219 |
| 5 | 220 def test_upload_2(self): |
| 3 | 221 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
| 222 instance = DoGet(_REMOTE, '/instances/%s' % i) | |
| 223 self.assertEqual(i, instance['ID']) | |
| 224 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', | |
| 225 instance['MainDicomTags']['SOPInstanceUID']) | |
| 226 | |
| 227 series = DoGet(_REMOTE, '/series/%s' % instance['ParentSeries']) | |
| 228 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 229 series['MainDicomTags']['SeriesInstanceUID']) | |
| 230 | |
| 231 study = DoGet(_REMOTE, '/studies/%s' % series['ParentStudy']) | |
| 232 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 233 study['MainDicomTags']['StudyInstanceUID']) | |
| 234 | |
| 235 patient = DoGet(_REMOTE, '/patients/%s' % study['ParentPatient']) | |
| 236 self.assertEqual('ozp00SjY2xG', | |
| 237 patient['MainDicomTags']['PatientID']) | |
| 238 | |
| 239 dicom = DoGet(_REMOTE, '/instances/%s/file' % instance['ID']) | |
| 240 self.assertEqual(2472, len(dicom)) | |
| 241 self.assertEqual('3e29b869978b6db4886355a2b1132124', ComputeMD5(dicom)) | |
| 242 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 243 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/simplified-tags' % i)['StationName']) | |
| 244 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
|
245 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
|
246 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/tags?short' % i)['0008,1010']) |
| 3 | 247 |
| 248 | |
| 5 | 249 def test_images(self): |
| 250 i = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID'] | |
| 251 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 3 | 252 |
| 5 | 253 im = GetImage(_REMOTE, '/instances/%s/preview' % i) |
| 254 self.assertEqual("L", im.mode) | |
| 255 self.assertEqual(512, im.size[0]) | |
| 256 self.assertEqual(358, im.size[1]) | |
| 257 | |
| 258 im = GetImage(_REMOTE, '/instances/%s/image-uint8' % i) | |
| 259 self.assertEqual("L", im.mode) | |
| 260 self.assertEqual(512, im.size[0]) | |
| 261 self.assertEqual(358, im.size[1]) | |
| 262 | |
| 263 im = GetImage(_REMOTE, '/instances/%s/image-uint16' % i) | |
| 264 self.assertEqual(512, im.size[0]) | |
| 265 self.assertEqual(358, im.size[1]) | |
| 266 | |
| 267 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % 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/frames/0/image-uint8' % i) | |
| 273 self.assertEqual("L", im.mode) | |
| 274 self.assertEqual(512, im.size[0]) | |
| 275 self.assertEqual(358, im.size[1]) | |
| 276 | |
| 277 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint16' % i) | |
| 278 self.assertEqual(512, im.size[0]) | |
| 279 self.assertEqual(358, im.size[1]) | |
| 64 | 280 |
| 281 # This is Little Endian Explicit | |
| 282 self.assertEqual('1.2.840.10008.1.2.1', DoGet(_REMOTE, '/instances/%s/header?simplify' % i)['TransferSyntaxUID']) | |
| 283 | |
| 6 | 284 |
| 285 def test_hierarchy(self): | |
| 286 UploadFolder(_REMOTE, 'Brainix/Epi') | |
| 287 UploadFolder(_REMOTE, 'Brainix/Flair') | |
| 288 UploadFolder(_REMOTE, 'Knee/T1') | |
| 289 UploadFolder(_REMOTE, 'Knee/T2') | |
| 290 | |
| 291 p = DoGet(_REMOTE, '/patients') | |
| 292 s = DoGet(_REMOTE, '/studies') | |
| 293 t = DoGet(_REMOTE, '/series') | |
| 294 self.assertEqual(2, len(p)) | |
| 295 self.assertEqual(2, len(s)) | |
| 296 self.assertEqual(4, len(t)) | |
| 297 self.assertEqual(94, len(DoGet(_REMOTE, '/instances'))) | |
| 298 | |
| 299 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0' | |
| 300 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' | |
| 301 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8' | |
| 302 brainixFlair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' | |
| 303 | |
| 304 kneePatient = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' | |
| 305 kneeStudy = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' | |
| 306 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' | |
| 307 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' | |
| 308 | |
| 309 self.assertTrue(brainixPatient in p) | |
| 310 self.assertTrue(kneePatient in p) | |
| 311 self.assertTrue(brainixStudy in s) | |
| 312 self.assertTrue(kneeStudy in s) | |
| 313 self.assertTrue(brainixEpi in t) | |
| 314 self.assertTrue(brainixFlair in t) | |
| 315 self.assertTrue(kneeT1 in t) | |
| 316 self.assertTrue(kneeT2 in t) | |
| 317 | |
| 318 self.assertEqual(44, len(DoGet(_REMOTE, '/patients/%s/instances' % brainixPatient))) | |
| 319 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % brainixPatient))) | |
| 320 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % brainixPatient))) | |
| 321 | |
| 322 self.assertEqual(50, len(DoGet(_REMOTE, '/patients/%s/instances' % kneePatient))) | |
| 323 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % kneePatient))) | |
| 324 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % kneePatient))) | |
| 325 | |
| 326 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % brainixStudy))) | |
| 327 self.assertEqual(44, len(DoGet(_REMOTE, '/studies/%s/instances' % brainixStudy))) | |
| 328 | |
| 329 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % kneeStudy))) | |
| 330 self.assertEqual(50, len(DoGet(_REMOTE, '/studies/%s/instances' % kneeStudy))) | |
| 331 | |
| 332 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixEpi))) | |
| 333 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixFlair))) | |
| 334 self.assertEqual(24, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT1))) | |
| 335 self.assertEqual(26, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT2))) | |
| 336 | |
| 337 for patient in p: | |
| 338 for study in DoGet(_REMOTE, '/patients/%s/studies' % patient): | |
| 339 self.assertEqual(patient, study['ParentPatient']) | |
| 340 for series in DoGet(_REMOTE, '/studies/%s/series' % study['ID']): | |
| 341 self.assertEqual(study['ID'], series['ParentStudy']) | |
| 342 for instance in DoGet(_REMOTE, '/series/%s/instances' % series['ID']): | |
| 343 self.assertEqual(series['ID'], instance['ParentSeries']) | |
| 344 | |
| 345 self.assertEqual(json.dumps(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/data' % instance['ID'])), | |
| 346 json.dumps(DoGet(_REMOTE, '/instances/%s/tags' % instance['ID']))) | |
| 347 | |
| 348 | |
| 349 r = DoDelete(_REMOTE, "/studies/%s" % brainixStudy)['RemainingAncestor'] | |
| 350 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 351 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 352 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 353 self.assertEqual(50, len(DoGet(_REMOTE, '/instances'))) | |
| 354 self.assertEqual(None, r) | |
| 355 | |
| 356 r = DoDelete(_REMOTE, "/series/%s" % kneeT2)['RemainingAncestor'] | |
| 357 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 358 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 359 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 360 self.assertEqual(24, len(DoGet(_REMOTE, '/instances'))) | |
| 361 self.assertEqual('Study', r['Type']) | |
| 362 self.assertEqual(kneeStudy, r['ID']) | |
| 363 | |
| 364 r = DoDelete(_REMOTE, "/instances/%s" % DoGet(_REMOTE, '/instances')[0])['RemainingAncestor'] | |
| 365 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 366 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 367 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 368 self.assertEqual(23, len(DoGet(_REMOTE, '/instances'))) | |
| 369 self.assertEqual('Series', r['Type']) | |
| 370 self.assertEqual(kneeT1, r['ID']) | |
| 371 | |
| 372 r = DoDelete(_REMOTE, "/patients/%s" % kneePatient)['RemainingAncestor'] | |
| 373 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 374 self.assertEqual(0, len(DoGet(_REMOTE, '/studies'))) | |
| 375 self.assertEqual(0, len(DoGet(_REMOTE, '/series'))) | |
| 376 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 377 self.assertEqual(None, r) | |
| 378 | |
| 379 DropOrthanc(_REMOTE) | |
| 380 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 381 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 7 | 382 |
| 383 | |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
384 def test_multiframe(self): |
| 7 | 385 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] |
| 386 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % i))) | |
| 387 | |
| 388 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i) | |
| 389 self.assertEqual("L", im.mode) | |
| 390 self.assertEqual(512, im.size[0]) | |
| 391 self.assertEqual(512, im.size[1]) | |
| 392 | |
| 393 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint8' % i) | |
| 394 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint16' % i) | |
| 395 DoGet(_REMOTE, '/instances/%s/frames/75/preview' % i) | |
| 396 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/aaa/preview' % i)) | |
| 397 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/76/preview' % i)) | |
| 398 | |
|
8
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
399 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
400 def test_changes(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
401 # Check emptiness |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
402 c = DoGet(_REMOTE, '/changes') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
403 self.assertEqual(0, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
404 self.assertEqual(0, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
405 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
406 c = DoGet(_REMOTE, '/changes?last') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
407 self.assertEqual(0, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
408 self.assertEqual(0, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
409 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
410 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
411 # Add 1 instance |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
412 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
|
413 c = DoGet(_REMOTE, '/changes') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
414 begin = c['Last'] |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
415 self.assertEqual(4, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
416 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
417 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
|
418 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
419 c = DoGet(_REMOTE, '/changes?last') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
420 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
421 self.assertEqual(begin, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
422 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
423 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
|
424 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
425 self.assertEqual(begin, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
426 self.assertTrue(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
427 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
|
428 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
429 self.assertEqual(begin - 1, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
430 self.assertFalse(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
431 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
|
432 self.assertEqual(1, len(c['Changes'])) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
433 self.assertEqual(begin - 2, c['Last']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
434 self.assertFalse(c['Done']) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
435 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
436 UploadFolder(_REMOTE, 'Knee/T1') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
437 UploadFolder(_REMOTE, 'Knee/T2') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
438 since = begin |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
439 countPatients = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
440 countStudies = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
441 countSeries = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
442 countInstances = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
443 completed = 0 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
444 while True: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
445 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
|
446 since = c['Last'] |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
447 for i in c['Changes']: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
448 if i['ResourceType'] == 'Instance': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
449 countInstances += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
450 if i['ResourceType'] == 'Patient': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
451 countPatients += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
452 if i['ResourceType'] == 'Study': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
453 countStudies += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
454 if i['ResourceType'] == 'Series': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
455 countSeries += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
456 if i['ChangeType'] == 'NewInstance': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
457 countInstances += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
458 if i['ChangeType'] == 'NewPatient': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
459 countPatients += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
460 if i['ChangeType'] == 'NewStudy': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
461 countStudies += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
462 if i['ChangeType'] == 'NewSeries': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
463 countSeries += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
464 if i['ChangeType'] == 'CompletedSeries': |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
465 completed += 1 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
466 self.assertTrue('ID' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
467 self.assertTrue('Path' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
468 self.assertTrue('Seq' in i) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
469 if c['Done']: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
470 break |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
471 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
472 self.assertEqual(2 * 50, countInstances) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
473 self.assertEqual(2 * 1, countPatients) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
474 self.assertEqual(2 * 1, countStudies) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
475 self.assertEqual(2 * 2, countSeries) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
476 self.assertEqual(0, completed) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
477 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
478 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
479 def test_archive(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
480 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
|
481 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
|
482 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
483 z = GetArchive(_REMOTE, '/patients/%s/archive' % DoGet(_REMOTE, '/patients')[0]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
484 self.assertEqual(2, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
485 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
486 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
|
487 self.assertEqual(2, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
488 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
489 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
|
490 self.assertEqual(1, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
491 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
492 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
493 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
494 z = GetArchive(_REMOTE, '/patients/%s/archive' % DoGet(_REMOTE, '/patients')[0]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
495 self.assertEqual(2, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
496 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
497 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
498 def test_media_archive(self): |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
499 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
|
500 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
|
501 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
502 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
|
503 self.assertEqual(3, len(z.namelist())) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
504 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
|
505 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
|
506 self.assertTrue('DICOMDIR' in z.namelist()) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
507 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
508 try: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
509 os.remove('/tmp/DICOMDIR') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
510 except: |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
511 # The file does not exist |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
512 pass |
|
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.extract('DICOMDIR', '/tmp') |
| 45 | 515 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
|
516 stderr = subprocess.STDOUT).split('\n') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
517 self.assertEqual(3, len(a)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
518 self.assertTrue(a[0].startswith('Warning')) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
519 self.assertEqual('BasicDirectory', a[1]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
520 self.assertEqual('', a[2]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
521 |
| 45 | 522 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
|
523 stderr = subprocess.STDOUT).split('\n') |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
524 self.assertEqual(1, len(a)) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
525 self.assertEqual('', a[0]) |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
526 |
| 45 | 527 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
|
528 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
|
529 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
|
530 |
|
f8d781d1d267
test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
7
diff
changeset
|
531 os.remove('/tmp/DICOMDIR') |
| 10 | 532 |
| 533 | |
| 534 def test_protection(self): | |
| 535 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 536 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 537 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 538 a = DoGet(_REMOTE, '/patients')[0] | |
| 539 b = DoGet(_REMOTE, '/patients')[1] | |
| 540 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 541 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain') | |
| 542 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 543 DoPut(_REMOTE, '/patients/%s/protected' % a, '1', 'text/plain') | |
| 544 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 545 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain') | |
| 546 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 547 | |
| 548 | |
| 12 | 549 def test_raw_tags(self): |
| 10 | 550 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] |
| 551 | |
| 552 dicom = DoGet(_REMOTE, '/instances/%s/file' % i) | |
| 553 self.assertEqual('1a7c56cb02d6e742cc9c856a8ac182e3', ComputeMD5(dicom)) | |
| 554 | |
| 555 s = '/instances/%s/content/' % i | |
| 556 | |
| 557 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, s + '0008-1010').strip()) | |
| 558 self.assertRaises(Exception, lambda: DoGet(_REMOTE, s + '0008-1011')) | |
| 559 | |
| 560 self.assertEqual('Abdomen', DoGet(_REMOTE, s + '7fe1-1001/0/7fe1-1008/0/7fe1-1057').strip()) | |
| 561 self.assertEqual('cla_3c', DoGet(_REMOTE, s + '7fe1-1001/0/7fe1-1008/8/7fe1-1057').strip()) | |
| 562 | |
| 563 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 564 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 565 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 566 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 567 | |
| 568 for i in DoGet(_REMOTE, '/instances'): | |
| 569 aid = DoGet(_REMOTE, '/instances/%s' % i)['MainDicomTags']['SOPInstanceUID'] | |
| 570 self.assertEqual(aid, DoGet(_REMOTE, '/instances/%s/content/0008-0018' % i).replace(chr(0), '')) | |
| 571 | |
| 572 | |
| 573 def test_raw_tags_mdn(self): | |
| 574 # Bug reported by Cyril Paulus | |
| 575 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] | |
| 576 self.assertAlmostEqual(0.000027, DoGet(_REMOTE, '/instances/%s/content/7053-1000' % i)) | |
| 577 | |
| 578 | |
| 579 def test_modify_instance(self): | |
| 580 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] | |
| 581 modified = DoPost(_REMOTE, '/instances/%s/modify' % i, | |
| 582 json.dumps({ | |
| 583 "Replace" : { | |
| 584 "PatientName" : "hello", | |
| 585 #"PatientID" : "world" | |
| 586 }, | |
| 587 "Remove" : [ "StationName" ], | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
588 "RemovePrivateTags" : True |
| 10 | 589 }), |
| 590 'application/json') | |
| 591 j = DoPost(_REMOTE, '/instances', modified, 'application/dicom')['ID'] | |
| 592 | |
| 593 self.assertNotEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 594 #self.assertNotEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % i).strip()) | |
| 83 | 595 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i).strip()) |
| 10 | 596 DoGet(_REMOTE, '/instances/%s/content/6003-1010' % i) # Some private tag |
| 597 | |
| 598 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 599 #self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % j).strip()) | |
| 600 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j)) | |
| 601 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/6003-1010' % j)) | |
| 602 | |
| 603 | |
| 604 def test_modify_series(self): | |
| 605 # Upload 4 images from the same series | |
| 606 for i in range(4): | |
| 607 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 608 | |
| 609 origSeries = DoGet(_REMOTE, '/series')[0] | |
| 610 newSeries = DoPost(_REMOTE, '/series/%s/modify' % origSeries, | |
| 611 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 612 'application/json')['ID'] | |
| 613 | |
| 614 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['ModifiedFrom']) | |
| 615 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances'] | |
| 616 self.assertEqual(4, len(instances)) | |
| 617 for i in instances: | |
| 618 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom'] | |
| 619 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 620 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 621 | |
| 622 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 623 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 624 | |
| 625 | |
| 626 def test_modify_study(self): | |
| 627 # Upload 4 images from the 2 series of the same study | |
| 628 for i in range(4): | |
| 629 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 630 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 631 | |
| 632 origStudy = DoGet(_REMOTE, '/studies')[0] | |
| 633 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy, | |
| 634 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 635 'application/json')['ID'] | |
| 636 | |
| 637 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['ModifiedFrom']) | |
| 638 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series'] | |
| 639 self.assertEqual(2, len(series)) | |
| 640 for s in series: | |
| 641 ss = DoGet(_REMOTE, '/series/%s' % s)['ModifiedFrom'] | |
| 642 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy']) | |
| 643 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy']) | |
| 644 | |
| 645 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances'] | |
| 646 for i in instances: | |
| 647 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom'] | |
| 648 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 649 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 650 | |
| 651 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 652 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 653 | |
| 654 | |
| 655 def test_anonymize_series(self): | |
| 656 # Upload 4 images from the same series | |
| 657 for i in range(4): | |
| 658 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 659 | |
| 660 origSeries = DoGet(_REMOTE, '/series')[0] | |
| 661 newSeries = DoPost(_REMOTE, '/series/%s/anonymize' % origSeries, | |
| 662 '{}', | |
| 663 'application/json')['ID'] | |
| 664 | |
| 665 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['AnonymizedFrom']) | |
| 666 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances'] | |
| 667 self.assertEqual(4, len(instances)) | |
| 668 for i in instances: | |
| 669 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom'] | |
| 670 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 671 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 672 | |
| 673 DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j) | |
| 674 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i)) | |
| 675 | |
| 676 | |
| 677 def test_anonymize_study(self): | |
| 678 # Upload 4 images from the 2 series of the same study | |
| 679 for i in range(4): | |
| 680 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 681 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 682 | |
| 683 origStudy = DoGet(_REMOTE, '/studies')[0] | |
| 684 newStudy = DoPost(_REMOTE,'/studies/%s/anonymize' % origStudy, | |
| 685 '{"Replace":{"PatientName":"Jodogne"}}', | |
| 686 'application/json')['ID'] | |
| 687 | |
| 688 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['AnonymizedFrom']) | |
| 689 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series'] | |
| 690 self.assertEqual(2, len(series)) | |
| 691 for s in series: | |
| 692 ss = DoGet(_REMOTE, '/series/%s' % s)['AnonymizedFrom'] | |
| 693 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy']) | |
| 694 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy']) | |
| 695 | |
| 696 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances'] | |
| 697 for i in instances: | |
| 698 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom'] | |
| 699 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']) | |
| 700 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries']) | |
| 701 | |
| 702 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | |
| 703 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | |
| 11 | 704 |
| 705 | |
| 706 | |
| 707 def test_storescu(self): | |
| 708 # Check emptiness | |
| 709 e = DoGet(_REMOTE, '/exports') | |
| 710 self.assertEqual(0, len(e['Exports'])) | |
| 711 self.assertEqual(0, e['Last']) | |
| 712 self.assertTrue(e['Done']) | |
| 713 e = DoGet(_REMOTE, '/exports?last') | |
| 714 self.assertEqual(0, len(e['Exports'])) | |
| 715 self.assertEqual(0, e['Last']) | |
| 716 self.assertTrue(e['Done']) | |
| 717 | |
| 718 # Add 1 instance | |
| 719 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 720 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 721 | |
| 722 # Export the instance | |
| 723 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') # instance | |
| 724 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 725 self.assertEqual(1, len(DoGet(_LOCAL, '/studies'))) | |
| 726 self.assertEqual(1, len(DoGet(_LOCAL, '/series'))) | |
| 727 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 728 | |
| 729 e = DoGet(_REMOTE, '/exports') | |
| 730 self.assertEqual(1, len(e['Exports'])) | |
| 731 self.assertTrue(e['Done']) | |
| 732 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 733 e = DoGet(_REMOTE, '/exports?limit=1') | |
| 734 self.assertEqual(1, len(e['Exports'])) | |
| 735 self.assertTrue(e['Done']) | |
| 736 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 737 e = DoGet(_REMOTE, '/exports?last') | |
| 738 self.assertEqual(1, len(e['Exports'])) | |
| 739 self.assertTrue(e['Done']) | |
| 740 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 741 seqInstance = e['Last'] | |
| 742 | |
| 743 # Export the series | |
| 744 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', 'text/plain') | |
| 745 | |
| 746 e = DoGet(_REMOTE, '/exports') | |
| 747 self.assertEqual(2, len(e['Exports'])) | |
| 748 self.assertTrue(e['Done']) | |
| 749 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 750 seqSeries = e['Last'] | |
| 751 self.assertNotEqual(seqInstance, seqSeries) | |
| 752 e = DoGet(_REMOTE, '/exports?limit=1&since=0') | |
| 753 self.assertEqual(1, len(e['Exports'])) | |
| 754 self.assertFalse(e['Done']) | |
| 755 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance) | |
| 756 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance)) | |
| 757 self.assertEqual(1, len(e['Exports'])) | |
| 758 self.assertTrue(e['Done']) | |
| 759 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 760 e = DoGet(_REMOTE, '/exports?last') | |
| 761 self.assertEqual(1, len(e['Exports'])) | |
| 762 self.assertTrue(e['Done']) | |
| 763 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 764 | |
| 765 # Export the study | |
| 766 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', 'text/plain') | |
| 767 seqStudy = DoGet(_REMOTE, '/exports')['Last'] | |
| 768 | |
| 769 # Export the patient | |
| 770 j = DoPost(_REMOTE, '/modalities/orthanctest/store', '6816cb19-844d5aee-85245eba-28e841e6-2414fae2', 'text/plain') | |
| 771 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 772 self.assertEqual(1, len(DoGet(_LOCAL, '/studies'))) | |
| 773 self.assertEqual(1, len(DoGet(_LOCAL, '/series'))) | |
| 774 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 775 | |
| 776 e = DoGet(_REMOTE, '/exports') | |
| 777 self.assertEqual(4, len(e['Exports'])) | |
| 778 self.assertTrue(e['Done']) | |
| 779 self.assertEqual(e['Exports'][-1]['Seq'], e['Last']) | |
| 780 seqPatient = e['Last'] | |
| 781 self.assertNotEqual(seqInstance, seqSeries) | |
| 782 self.assertNotEqual(seqSeries, seqStudy) | |
| 783 self.assertNotEqual(seqStudy, seqPatient) | |
| 784 self.assertTrue(seqInstance < seqSeries) | |
| 785 self.assertTrue(seqSeries < seqStudy) | |
| 786 self.assertTrue(seqStudy < seqPatient) | |
| 787 e = DoGet(_REMOTE, '/exports?limit=1&since=0') | |
| 788 self.assertEqual(1, len(e['Exports'])) | |
| 789 self.assertFalse(e['Done']) | |
| 790 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance) | |
| 791 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance)) | |
| 792 self.assertEqual(1, len(e['Exports'])) | |
| 793 self.assertFalse(e['Done']) | |
| 794 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries) | |
| 795 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqSeries)) | |
| 796 self.assertEqual(1, len(e['Exports'])) | |
| 797 self.assertFalse(e['Done']) | |
| 798 self.assertEqual(e['Exports'][-1]['Seq'], seqStudy) | |
| 799 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqStudy)) | |
| 800 self.assertEqual(1, len(e['Exports'])) | |
| 801 self.assertTrue(e['Done']) | |
| 802 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient) | |
| 803 e = DoGet(_REMOTE, '/exports?last') | |
| 804 self.assertEqual(1, len(e['Exports'])) | |
| 805 self.assertTrue(e['Done']) | |
| 806 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient) | |
| 807 | |
| 808 | |
| 809 # Check the content of the logged information | |
| 810 e = DoGet(_REMOTE, '/exports')['Exports'] | |
| 811 | |
| 812 if 'PatientID' in e[0]: | |
| 813 # Since Orthanc 0.8.6 | |
| 814 patient = 'PatientID' | |
| 815 study = 'StudyInstanceUID' | |
| 816 series = 'SeriesInstanceUID' | |
| 817 instance = 'SOPInstanceUID' | |
| 818 else: | |
| 819 # Up to Orthanc 0.8.5 | |
| 820 patient = 'PatientId' | |
| 821 study = 'StudyInstanceUid' | |
| 822 series = 'SeriesInstanceUid' | |
| 823 instance = 'SopInstanceUid' | |
| 824 | |
| 825 for k in range(4): | |
| 826 self.assertTrue('Date' in e[k]) | |
| 827 self.assertTrue('Seq' in e[k]) | |
| 828 self.assertEqual('orthanctest', e[k]['RemoteModality']) | |
| 829 | |
| 830 self.assertEqual(10, len(e[0])) | |
| 831 self.assertEqual('Instance', e[0]['ResourceType']) | |
| 832 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['ID']) | |
| 833 self.assertEqual('/instances/66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['Path']) | |
| 834 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', e[0][instance]) | |
| 835 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', e[0][series]) | |
| 836 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[0][study]) | |
| 837 self.assertEqual('ozp00SjY2xG', e[0][patient]) | |
| 838 | |
| 839 self.assertEqual(9, len(e[1])) | |
| 840 self.assertEqual('Series', e[1]['ResourceType']) | |
| 841 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['ID']) | |
| 842 self.assertEqual('/series/f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['Path']) | |
| 843 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', e[1][series]) | |
| 844 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[1][study]) | |
| 845 self.assertEqual('ozp00SjY2xG', e[1][patient]) | |
| 846 | |
| 847 self.assertEqual(8, len(e[2])) | |
| 848 self.assertEqual('Study', e[2]['ResourceType']) | |
| 849 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['ID']) | |
| 850 self.assertEqual('/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['Path']) | |
| 851 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[2][study]) | |
| 852 self.assertEqual('ozp00SjY2xG', e[2][patient]) | |
| 853 | |
| 854 self.assertEqual(7, len(e[3])) | |
| 855 self.assertEqual('Patient', e[3]['ResourceType']) | |
| 856 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['ID']) | |
| 857 self.assertEqual('/patients/6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['Path']) | |
| 858 self.assertEqual('ozp00SjY2xG', e[3][patient]) | |
| 859 | |
| 860 DropOrthanc(_REMOTE) | |
| 861 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 862 | |
| 863 | |
| 864 def test_store_peer(self): | |
| 865 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports'])) | |
| 866 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 867 | |
| 868 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 869 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 870 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 871 | |
| 872 j = DoPost(_REMOTE, '/peers/peer/store', str(i), 'text/plain') | |
| 873 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 874 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 875 | |
| 876 self.assertEqual(1, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 877 | |
| 878 DropOrthanc(_REMOTE) | |
| 879 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) | |
| 880 | |
| 881 | |
| 882 def test_bulk_storescu(self): | |
| 883 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 884 | |
| 885 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 886 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 887 | |
| 888 j = DoPost(_REMOTE, '/modalities/orthanctest/store', [ a['ID'], b['ID'] ], 'application/json') | |
| 889 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) | |
| 890 | |
| 891 DropOrthanc(_LOCAL) | |
| 892 | |
| 893 # Send using patient's UUID | |
| 894 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 895 j = DoPost(_REMOTE, '/modalities/orthanctest/store', | |
| 896 [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ], 'application/json') | |
| 897 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) | |
| 898 | |
| 899 | |
| 900 def test_color(self): | |
| 901 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID'] | |
| 902 im = GetImage(_REMOTE, '/instances/%s/preview' % i) | |
| 903 self.assertEqual("RGB", im.mode) | |
| 904 self.assertEqual(41, im.size[0]) | |
| 905 self.assertEqual(41, im.size[1]) | |
| 906 | |
| 907 # http://effbot.org/zone/pil-comparing-images.htm | |
| 13 | 908 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png')) |
| 11 | 909 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None) |
| 910 | |
| 911 | |
| 12 | 912 def test_faking_ruby_put(self): |
| 913 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 914 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 915 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 916 a = DoGet(_REMOTE, '/patients')[0] | |
| 917 b = DoGet(_REMOTE, '/patients')[1] | |
| 918 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 919 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0') | |
| 920 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 921 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '1') | |
| 922 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 923 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0') | |
| 924 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 925 | |
| 926 | |
| 927 def test_faking_ruby_delete(self): | |
| 928 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 929 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 930 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 931 a = DoGet(_REMOTE, '/patients')[0] | |
| 932 b = DoGet(_REMOTE, '/patients')[1] | |
| 933 DoGet(_REMOTE, '/patients/%s' % a, data = { '_method' : 'DELETE' }) | |
| 934 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 935 DoGet(_REMOTE, '/patients/%s' % b, data = { '_method' : 'DELETE' }) | |
| 936 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 937 | |
| 938 | |
| 939 def test_faking_google_put(self): | |
| 940 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 941 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 942 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 943 a = DoGet(_REMOTE, '/patients')[0] | |
| 944 b = DoGet(_REMOTE, '/patients')[1] | |
| 945 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 946 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '0') | |
| 947 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 948 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '1') | |
| 949 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 950 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '0') | |
| 951 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a)) | |
| 952 | |
| 953 | |
| 954 def test_faking_google_delete(self): | |
| 955 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 956 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 957 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 958 a = DoGet(_REMOTE, '/patients')[0] | |
| 959 b = DoGet(_REMOTE, '/patients')[1] | |
| 960 DoPost(_REMOTE, '/patients/%s' % a, headers = { 'X-HTTP-Method-Override' : 'DELETE' }) | |
| 961 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 962 DoPost(_REMOTE, '/patients/%s' % b, headers = { 'X-HTTP-Method-Override' : 'DELETE' }) | |
| 963 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 964 | |
| 965 | |
| 966 def test_lua(self): | |
| 967 self.assertEqual(42, DoPost(_REMOTE, '/tools/execute-script', 'print(42)')) | |
| 968 self.assertTrue(IsDefinedInLua(_REMOTE, 'PrintRecursive')) | |
| 969 self.assertFalse(IsDefinedInLua(_REMOTE, 'HelloWorld')) | |
| 970 | |
| 971 | |
| 972 def test_metadata(self): | |
| 973 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 974 p = DoGet(_REMOTE, '/patients')[0] | |
| 975 i = DoGet(_REMOTE, '/instances')[0] | |
| 976 | |
| 977 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) | |
| 978 self.assertEqual(1, len(m)) | |
| 979 self.assertEqual('LastUpdate', m[0]) | |
| 980 | |
| 981 m = DoGet(_REMOTE, '/instances/%s/metadata' % i) | |
| 145 | 982 self.assertEqual(8, len(m)) |
| 12 | 983 self.assertTrue('IndexInSeries' in m) |
| 984 self.assertTrue('ReceptionDate' in m) | |
| 985 self.assertTrue('RemoteAET' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
986 self.assertTrue('Origin' in m) |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
987 self.assertTrue('TransferSyntax' in m) |
|
95
a807a4699eb4
testing of metadata SopClassUid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
988 self.assertTrue('SopClassUid' in m) |
| 145 | 989 self.assertTrue('RemoteIP' in m) |
| 990 self.assertTrue('HttpUsername' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
991 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
|
992 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
|
993 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
|
994 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
|
995 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i), '1.2.840.10008.5.1.4.1.1.4') |
| 12 | 996 |
| 997 # Play with custom metadata | |
| 998 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'coucou') | |
| 999 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) | |
| 1000 self.assertEqual(2, len(m)) | |
| 1001 self.assertTrue('LastUpdate' in m) | |
| 1002 self.assertTrue('5555' in m) | |
| 1003 self.assertEqual('coucou', DoGet(_REMOTE, '/patients/%s/metadata/5555' % p)) | |
| 1004 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'hello') | |
| 1005 self.assertEqual('hello', DoGet(_REMOTE, '/patients/%s/metadata/5555' % p)) | |
| 1006 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p) | |
| 1007 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) | |
| 1008 self.assertEqual(1, len(m)) | |
| 1009 self.assertTrue('LastUpdate' in m) | |
| 13 | 1010 |
| 1011 | |
| 1012 def test_statistics(self): | |
| 1013 # Upload 16 instances | |
| 1014 for i in range(4): | |
| 1015 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 1016 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 1017 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 1018 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 1019 | |
| 1020 s = DoGet(_REMOTE, '/statistics') | |
| 1021 self.assertEqual(16, s['CountInstances']) | |
| 1022 self.assertEqual(2, s['CountPatients']) | |
| 1023 self.assertEqual(2, s['CountStudies']) | |
| 1024 self.assertEqual(4, s['CountSeries']) | |
| 1025 d = int(s['TotalUncompressedSize']) | |
| 1026 | |
| 1027 e = 0 | |
| 1028 for patient in DoGet(_REMOTE, '/patients'): | |
| 1029 s = DoGet(_REMOTE, '/patients/%s/statistics' % patient) | |
| 1030 self.assertEqual(8, s['CountInstances']) | |
| 1031 self.assertEqual(1, s['CountStudies']) | |
| 1032 self.assertEqual(2, s['CountSeries']) | |
| 1033 e += int(s['UncompressedSize']) | |
| 1034 | |
| 1035 for study in DoGet(_REMOTE, '/studies'): | |
| 1036 s = DoGet(_REMOTE, '/studies/%s/statistics' % study) | |
| 1037 self.assertEqual(8, s['CountInstances']) | |
| 1038 self.assertEqual(2, s['CountSeries']) | |
| 1039 e += int(s['UncompressedSize']) | |
| 1040 | |
| 1041 for series in DoGet(_REMOTE, '/series'): | |
| 1042 s = DoGet(_REMOTE, '/series/%s/statistics' % series) | |
| 1043 self.assertEqual(4, s['CountInstances']) | |
| 1044 e += int(s['UncompressedSize']) | |
| 1045 | |
| 1046 self.assertEqual(3 * d, e) | |
| 1047 | |
| 1048 | |
| 1049 def test_custom_attachment(self): | |
| 1050 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 1051 patient = DoGet(_REMOTE, '/patients')[0] | |
| 1052 instance = DoGet(_REMOTE, '/instances')[0] | |
| 1053 size = int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']) | |
| 1054 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1055 | |
| 1056 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) | |
| 1057 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance))) | |
| 1058 self.assertTrue('dicom' in DoGet(_REMOTE, '/instances/%s/attachments' % instance)) | |
| 1059 self.assertTrue('dicom-as-json' in DoGet(_REMOTE, '/instances/%s/attachments' % instance)) | |
| 1060 | |
| 1061 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/patients/%s/attachments/22' % patient, 'hello')) | |
| 1062 hello = 'hellohellohellohellohellohellohellohellohello' | |
| 1063 DoPut(_REMOTE, '/patients/%s/attachments/1025' % patient, hello) | |
| 1064 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1065 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1066 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1067 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient))) | |
| 1068 | |
| 1069 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world') | |
| 1070 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1071 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1072 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1073 size + | |
| 1074 int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient)) + | |
| 1075 int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient))) | |
| 1076 | |
| 1077 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) | |
| 1078 self.assertEqual(hello, DoGet(_REMOTE, '/patients/%s/attachments/1025/data' % patient)) | |
| 1079 self.assertEqual('world', DoGet(_REMOTE, '/patients/%s/attachments/1026/data' % patient)) | |
| 1080 DoPost(_REMOTE, '/patients/%s/attachments/1025/verify-md5' % patient) | |
| 1081 DoPost(_REMOTE, '/patients/%s/attachments/1026/verify-md5' % patient) | |
| 1082 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world2') | |
| 1083 self.assertEqual('world2', DoGet(_REMOTE, '/patients/%s/attachments/1026/data' % patient)) | |
| 1084 | |
| 1085 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/instances/%s/attachments/dicom' % instance)) | |
| 1086 DoDelete(_REMOTE, '/patients/%s/attachments/1025' % patient) | |
| 1087 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1088 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1089 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), | |
| 1090 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient))) | |
| 1091 | |
| 1092 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) | |
| 1093 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient) | |
| 1094 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) | |
| 1095 | |
| 1096 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), size) | |
| 1097 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) | |
| 1098 | |
| 1099 | |
| 1100 def test_incoming_storescu(self): | |
| 1101 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 45 | 1102 subprocess.check_call([ FindExecutable('storescu'), |
|
44
ffa542cce638
Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
43
diff
changeset
|
1103 _REMOTE['Server'], str(_REMOTE['DicomPort']), |
| 13 | 1104 GetDatabasePath('ColorTestImageJ.dcm') ]) |
| 1105 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1106 | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1107 i = DoGet(_REMOTE, '/instances') |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1108 self.assertEqual(1, len(i)) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1109 m = DoGet(_REMOTE, '/instances/%s/metadata' % i[0]) |
| 145 | 1110 self.assertEqual(8, len(m)) |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1111 self.assertTrue('IndexInSeries' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1112 self.assertTrue('ReceptionDate' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1113 self.assertTrue('RemoteAET' in m) |
|
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1114 self.assertTrue('Origin' in m) |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
1115 self.assertTrue('TransferSyntax' in m) |
|
95
a807a4699eb4
testing of metadata SopClassUid
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
1116 self.assertTrue('SopClassUid' in m) |
| 145 | 1117 self.assertTrue('RemoteIP' in m) |
| 1118 self.assertTrue('CalledAET' in m) | |
|
63
2652d562267a
test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
1119 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
|
1120 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
|
1121 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
|
1122 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
|
1123 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
|
1124 |
| 13 | 1125 |
| 1126 def test_incoming_findscu(self): | |
| 1127 UploadInstance(_REMOTE, 'Multiframe.dcm') | |
| 1128 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') | |
| 1129 | |
| 1130 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', '0010,0010' ]) | |
| 1131 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) | |
| 1132 self.assertEqual(2, len(patientNames)) | |
| 1133 self.assertTrue('Test Patient BG ' in patientNames) | |
| 1134 self.assertTrue('Anonymized' in patientNames) | |
| 1135 | |
| 1136 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,0021' ]) | |
| 1137 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i) | |
| 1138 self.assertEqual(2, len(series)) | |
| 1139 self.assertTrue('20070208' in series) | |
| 1140 self.assertTrue('19980312' in series) | |
| 1141 | |
|
56
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1142 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
|
1143 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1144 self.assertEqual(1, len(series)) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1145 self.assertTrue('19980312' in series) |
|
1059b8de42de
ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
55
diff
changeset
|
1146 |
| 13 | 1147 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=Anonymized' ]) |
| 1148 series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i) | |
| 1149 self.assertEqual(1, len(series)) | |
| 1150 | |
| 1151 # Test the "CaseSentitivePN" flag (false by default) | |
| 1152 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=anonymized' ]) | |
| 1153 series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i) | |
| 1154 self.assertEqual(1, len(series)) | |
|
66
821d9eb73c45
Test returning sequence values
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
1155 |
|
821d9eb73c45
Test returning sequence values
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
1156 # Test returning sequence values (only since Orthanc 0.9.5) |
|
821d9eb73c45
Test returning sequence values
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
1157 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,2112' ]) # "ColorTestImageJ" has this sequence tag |
|
821d9eb73c45
Test returning sequence values
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
1158 sequences = re.findall('\(0008,2112\)', i) |
|
821d9eb73c45
Test returning sequence values
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
1159 self.assertEqual(1, len(sequences)) |
| 70 | 1160 |
| 1161 # Test range search (buggy if Orthanc <= 0.9.6) | |
| 1162 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-' ]) | |
| 1163 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1164 self.assertEqual(2, len(studies)) | |
| 1165 self.assertTrue('20070208' in studies) | |
| 1166 self.assertTrue('19980312' in studies) | |
| 1167 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-19980312' ]) | |
| 1168 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1169 self.assertEqual(1, len(studies)) | |
| 1170 self.assertTrue('19980312' in studies) | |
| 1171 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=-19980312' ]) | |
| 1172 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i) | |
| 1173 self.assertEqual(1, len(studies)) | |
| 1174 self.assertTrue('19980312' in studies) | |
| 13 | 1175 |
| 1176 | |
| 1177 def test_incoming_movescu(self): | |
| 1178 UploadInstance(_REMOTE, 'Multiframe.dcm') | |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1179 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1180 # No matching patient, so no job is created |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1181 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1182 CallMoveScu([ '--patient', '-k', '0008,0052=PATIENT', '-k', 'PatientID=none' ]) |
| 13 | 1183 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1184 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
1185 # 1 Matching patient, track the job |
| 138 | 1186 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
| 1187 '--patient', | |
| 1188 '-k', '0008,0052=PATIENT', | |
| 1189 '-k', 'PatientID=12345678' | |
| 1190 ]))) | |
| 13 | 1191 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) |
| 1192 | |
| 1193 | |
| 1194 def test_findscu(self): | |
| 1195 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1196 j = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] | |
| 1197 k = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] | |
| 1198 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 1199 | |
| 1200 # Test the "find-patient" level | |
| 1201 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }) | |
| 1202 self.assertEqual(1, len(p)) | |
| 1203 self.assertEqual('ozp00SjY2xG', p[0]['PatientID']) | |
| 1204 | |
| 1205 # Test wildcards constraints. The "LO" value representation | |
| 1206 # for PatientID is always case-sensitive, but the "PN" for | |
| 1207 # PatientName might depend on the implementation: | |
| 1208 # "GenerateConfigurationForTests.py" will force it to be case | |
| 1209 # insensitive (which was the default until Orthanc 0.8.6). | |
| 1210 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'K*' }) | |
| 1211 self.assertEqual(1, len(p)) | |
| 1212 | |
| 1213 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'k*' }) | |
| 1214 self.assertEqual(1, len(p)) | |
| 1215 | |
| 1216 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'ozp*' }) | |
| 1217 self.assertEqual(1, len(p)) | |
| 1218 | |
| 1219 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'o?p*' }) | |
| 1220 self.assertEqual(1, len(p)) | |
| 1221 | |
| 1222 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : '0?q*' }) | |
| 1223 self.assertEqual(0, len(p)) | |
| 1224 | |
| 1225 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'B*' }) | |
| 1226 self.assertEqual(0, len(p)) | |
| 1227 | |
| 1228 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'b*' }) | |
| 1229 self.assertEqual(0, len(p)) | |
| 1230 | |
| 1231 DoPost(_REMOTE, '/modalities/orthanctest/store', str(j), 'text/plain') | |
| 1232 DoPost(_REMOTE, '/modalities/orthanctest/store', str(k), 'text/plain') | |
| 1233 DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }) | |
| 1234 self.assertEqual(3, len(DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }))) | |
| 1235 | |
| 1236 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'A*' }) | |
| 1237 self.assertEqual(2, len(p)) | |
| 1238 | |
| 1239 # Test the "find-study" level. This is the instance "ColorTestImageJ.dcm" | |
| 1240 s = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ' }) | |
| 1241 self.assertEqual(1, len(s)) | |
| 1242 self.assertEqual('20070208', s[0]['StudyDate']) | |
| 1243 | |
| 1244 # Test range searches | |
| 1245 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1246 'StudyDate' : '-20070101' }) | |
| 1247 self.assertEqual(0, len(t)) | |
| 1248 | |
| 1249 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1250 'StudyDate' : '20090101-' }) | |
| 1251 self.assertEqual(0, len(t)) | |
| 1252 | |
| 1253 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1254 'StudyDate' : '20070101-' }) | |
| 1255 self.assertEqual(1, len(t)) | |
| 1256 | |
| 1257 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1258 'StudyDate' : '-20090101' }) | |
| 1259 self.assertEqual(1, len(t)) | |
| 1260 | |
| 1261 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1262 'StudyDate' : '20070207-20070207' }) | |
| 1263 self.assertEqual(0, len(t)) | |
| 1264 | |
| 1265 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1266 'StudyDate' : '20070208-20070208' }) | |
| 1267 self.assertEqual(1, len(t)) | |
| 1268 | |
| 1269 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', | |
| 1270 'StudyDate' : '20070209-20070209' }) | |
| 1271 self.assertEqual(0, len(t)) | |
| 1272 | |
| 1273 # Test the ModalitiesInStudy tag | |
| 1274 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1275 'PatientID' : 'B9uTHKOZ', | |
| 1276 'ModalitiesInStudy' : 'US' }) | |
| 1277 self.assertEqual(0, len(t)) | |
| 1278 | |
| 1279 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1280 'PatientID' : 'B9uTHKOZ', | |
| 1281 'ModalitiesInStudy' : 'CT' }) | |
| 1282 self.assertEqual(1, len(t)) | |
| 1283 | |
| 1284 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { | |
| 1285 'PatientID' : 'B9uTHKOZ', | |
| 1286 'ModalitiesInStudy' : 'US\\CT' }) | |
| 1287 self.assertEqual(1, len(t)) | |
| 1288 | |
| 1289 # Test the "find-series" level | |
| 1290 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1291 'PatientID' : 'B9uTHKOZ', | |
| 1292 'StudyInstanceUID' : s[0]['StudyInstanceUID'] }) | |
| 1293 self.assertEqual(1, len(t)) | |
| 1294 | |
| 1295 # Test "\" separator | |
| 1296 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1297 'PatientID' : 'B9uTHKOZ', | |
| 1298 'StudyInstanceUID' : s[0]['StudyInstanceUID'], | |
| 1299 'Modality' : 'MR\\CT\\US' }) | |
| 1300 self.assertEqual(1, len(t)) | |
| 1301 | |
| 1302 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { | |
| 1303 'PatientID' : 'B9uTHKOZ', | |
| 1304 'StudyInstanceUID' : s[0]['StudyInstanceUID'], | |
| 1305 'Modality' : 'MR\\US' }) | |
| 1306 self.assertEqual(0, len(t)) | |
| 1307 | |
| 1308 | |
| 1309 def test_update_modalities(self): | |
| 1310 try: | |
| 1311 DoDelete(_REMOTE, '/modalities/toto') | |
| 1312 except: | |
| 1313 pass | |
| 1314 try: | |
| 1315 DoDelete(_REMOTE, '/modalities/tata') | |
| 1316 except: | |
| 1317 pass | |
| 1318 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto')) | |
| 1319 DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000 ]) | |
| 116 | 1320 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'MedInria' ]) # check backward compatiblity with obsolete manufacturer |
| 1321 DoDelete(_REMOTE, '/modalities/tata') | |
| 124 | 1322 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoUniversalWildcard' ]) |
|
121
1a19f953f53c
also test GenericNoWildcardInDates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
120
diff
changeset
|
1323 DoDelete(_REMOTE, '/modalities/tata') |
|
1a19f953f53c
also test GenericNoWildcardInDates
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
120
diff
changeset
|
1324 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoWildcardInDates' ]) |
| 128 | 1325 modalitiesReadback = DoGet(_REMOTE, '/modalities?expand') |
| 1326 self.assertEqual([ "STORESCP", "localhost", 2000, 'GenericNoWildcardInDates' ], modalitiesReadback['tata']) | |
| 116 | 1327 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000, 'InvalidManufacturerName' ])) |
| 13 | 1328 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/toto')) |
| 1329 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/tata')) | |
| 1330 DoDelete(_REMOTE, '/modalities/toto') | |
| 1331 DoDelete(_REMOTE, '/modalities/tata') | |
| 1332 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto')) | |
| 1333 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/tata')) | |
| 1334 | |
| 1335 | |
| 1336 def test_update_peers(self): | |
| 1337 # curl -X PUT http://localhost:8042/peers/toto -d '["http://localhost:8042/"]' -v | |
| 1338 try: | |
| 1339 DoDelete(_REMOTE, '/peers/toto') | |
| 1340 except: | |
| 1341 pass | |
| 1342 try: | |
| 1343 DoDelete(_REMOTE, '/peers/tata') | |
| 1344 except: | |
| 1345 pass | |
| 1346 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto')) | |
| 1347 DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/' ]) | |
| 1348 DoPut(_REMOTE, '/peers/tata', [ 'http://localhost:8042/', 'user', 'pass' ]) | |
| 128 | 1349 self.assertTrue('tata' in DoGet(_REMOTE, '/peers')) |
| 1350 peersReadback = DoGet(_REMOTE, '/peers?expand') | |
| 1351 self.assertEqual('http://localhost:8042/', peersReadback['tata']['Url']) | |
| 1352 self.assertEqual('user', peersReadback['tata']['Username']) | |
| 1353 self.assertFalse('Password' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1354 self.assertFalse('CertificateFile' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1355 self.assertFalse('CertificateKeyFile' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1356 self.assertFalse('CertificateKeyPassword' in peersReadback['tata']) # make sure no sensitive data is included | |
| 1357 self.assertFalse('Pkcs11' in peersReadback['tata']) # make sure no sensitive data is included | |
| 13 | 1358 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a' ])) |
| 1359 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a', 'b', 'c' ])) | |
| 1360 self.assertTrue('store' in DoGet(_REMOTE, '/peers/toto')) | |
| 1361 self.assertTrue('store' in DoGet(_REMOTE, '/peers/tata')) | |
| 1362 DoDelete(_REMOTE, '/peers/toto') | |
| 1363 DoDelete(_REMOTE, '/peers/tata') | |
| 1364 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto')) | |
| 1365 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/tata')) | |
| 1366 | |
| 1367 | |
| 1368 def test_mesterhazy_modification(self): | |
| 1369 # When I modify a series ( eg. curl | |
| 1370 # http://localhost:8042/series/uidhere/modify -X POST -d | |
| 1371 # '{"Replace":{"SeriesDate":"19990101"}}' ) the modified | |
| 1372 # series is added to a new Study, instead of the existing | |
| 1373 # Study. Fixed in Orthanc 0.7.5 | |
| 1374 | |
| 1375 u = UploadInstance(_REMOTE, 'DummyCT.dcm') | |
| 1376 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' | |
| 1377 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 1378 | |
| 1379 modified = DoPost(_REMOTE, '/series/%s/modify' % series, | |
| 1380 json.dumps({ "Replace" : { "SeriesDate" : "19990101" }})) | |
| 1381 | |
| 1382 self.assertEqual(study, DoGet(_REMOTE, '/series/%s' % modified['ID']) ['ParentStudy']) | |
| 1383 | |
| 1384 | |
| 1385 def test_create(self): | |
| 1386 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 1387 json.dumps({ | |
| 1388 'PatientName' : 'Jodogne', | |
| 1389 'Modality' : 'CT', | |
| 58 | 1390 'SOPClassUID' : '1.2.840.10008.5.1.4.1.1.1', |
| 13 | 1391 'PixelData' : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==' # red dot in RGBA |
| 1392 })) | |
| 1393 | |
| 1394 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 1395 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip()) | |
| 1396 | |
| 1397 png = GetImage(_REMOTE, '/instances/%s/preview' % i['ID']) | |
| 1398 self.assertEqual((5, 5), png.size) | |
| 1399 | |
| 38 | 1400 j = DoGet(_REMOTE, i['Path']) |
| 1401 self.assertEqual('Instance', j['Type']) | |
| 1402 self.assertEqual(j['ID'], i['ID']) | |
| 1403 | |
| 13 | 1404 |
| 1405 def test_pilates(self): | |
| 1406 # "SCU failed error when accessing orthanc with osirix" by | |
| 1407 # Pilates Agentur (Mar 10, 2014 at 9:33 PM) | |
| 1408 i = UploadInstance(_REMOTE, 'PilatesArgenturGEUltrasoundOsiriX.dcm')['ID'] | |
| 1409 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) | |
| 1410 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 1411 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) | |
| 1412 | |
| 1413 | |
| 1414 def test_shared_tags(self): | |
| 1415 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1416 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')['ID'] | |
| 1417 p = DoGet(_REMOTE, '/patients')[0] | |
| 1418 | |
| 1419 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1420 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
|
1421 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
|
1422 |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
1423 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
|
1424 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
|
1425 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
|
1426 |
| 13 | 1427 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) |
| 1428 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1429 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1430 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1431 self.assertFalse('0008,0018' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) | |
| 1432 self.assertFalse('SOPInstanceUID' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) | |
| 1433 | |
| 1434 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/tags' % a)) | |
| 1435 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/tags?simplify' % a)) | |
| 1436 | |
| 1437 | |
| 1438 def test_modules(self): | |
| 1439 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1440 p = DoGet(_REMOTE, '/patients')[0] | |
| 1441 s = DoGet(_REMOTE, '/studies')[0] | |
| 1442 t = DoGet(_REMOTE, '/series')[0] | |
| 1443 | |
| 1444 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/module' % p)) | |
| 1445 self.assertTrue('PatientName' in DoGet(_REMOTE, '/patients/%s/module?simplify' % p)) | |
| 1446 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/studies/%s/module-patient' % p)) | |
| 1447 self.assertTrue('PatientName' in DoGet(_REMOTE, '/studies/%s/module-patient?simplify' % p)) | |
| 1448 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/studies/%s/module' % s)) | |
| 1449 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/studies/%s/module?simplify' % s)) | |
| 1450 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/series/%s/module' % p)) | |
| 1451 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/series/%s/module?simplify' % p)) | |
| 1452 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/module' % a)) | |
| 1453 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/module?simplify' % a)) | |
| 1454 | |
| 1455 | |
| 1456 def test_auto_directory(self): | |
| 1457 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1458 self.assertTrue('now' in DoGet(_REMOTE, '/tools')) | |
| 1459 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
|
1460 self.assertTrue('invalidate-tags' in DoGet(_REMOTE, '/tools')) |
| 13 | 1461 self.assertTrue(len(DoGet(_REMOTE, '/tools/dicom-conformance')) > 1000) |
| 1462 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities')) | |
| 1463 self.assertTrue('echo' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1464 self.assertTrue('find' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1465 self.assertTrue('find-instance' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1466 self.assertTrue('find-patient' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1467 self.assertTrue('find-series' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1468 self.assertTrue('find-study' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1469 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/orthanctest')) | |
| 1470 self.assertTrue('store' in DoGet(_REMOTE, '/peers/peer')) | |
| 1471 self.assertTrue('matlab' in DoGet(_REMOTE, '/instances/%s/frames/0' % a)) | |
| 79 | 1472 self.assertTrue('raw' in DoGet(_REMOTE, '/instances/%s/frames/0' % a)) |
| 13 | 1473 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/tools/nope')) |
| 28 | 1474 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope')) |
| 1475 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope/nope.html')) | |
| 1476 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope')[0].status) | |
| 1477 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope/nope.html')[0].status) | |
| 13 | 1478 |
| 1479 | |
| 1480 def test_echo(self): | |
| 1481 DoPost(_REMOTE, '/modalities/orthanctest/echo') | |
| 1482 | |
| 1483 | |
| 1484 def test_xml(self): | |
| 1485 json = DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/json' }) | |
| 1486 xml = minidom.parseString(DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/xml' })) | |
| 1487 items = xml.getElementsByTagName('root')[0].getElementsByTagName('item') | |
| 1488 self.assertEqual(len(items), len(json)) | |
| 1489 | |
| 1490 self.assertTrue('dicom-conformance' in json) | |
| 1491 | |
| 1492 ok = False | |
| 1493 for i in items: | |
| 1494 if i.childNodes[0].data == 'dicom-conformance': | |
| 1495 ok = True | |
| 1496 self.assertTrue(ok) | |
| 1497 | |
| 1498 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1499 def test_googlecode_issue_16(self): |
| 13 | 1500 i = UploadInstance(_REMOTE, 'Issue16.dcm')['ID'] |
| 1501 t = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)['FrameIncrementPointer'] | |
| 1502 self.assertEqual('0018,1063', t) | |
| 1503 | |
| 1504 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1505 def test_googlecode_issue_22(self): |
| 13 | 1506 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] |
| 1507 a = [ | |
| 1508 "f804691f62197040438f4627c6b994f1", # Frame 0 | |
| 1509 "c69eee9a51eea3e8611e82e578897254", | |
| 1510 "315666be83e2d0111c77bc0996d84901", | |
| 1511 "3e27aa959d911172c48a1436443c72b1", | |
| 1512 "958642c9e7e9d232d3869faff546058c", | |
| 1513 "5e7ea8e3e4230cae707d143481355c59", | |
| 1514 "eda37f83558d858a596175aed8b2ad47", | |
| 1515 "486713bd2895c4ecbe0e97715ac7f80a", | |
| 1516 "091ef729eb169e67da8a0faa9631f9a8", | |
| 1517 "5aa2b8c7ffe0a483efaa8e12417686ca", | |
| 1518 "e2f39e85896fe58876654b94cd0b5013", | |
| 1519 "6fd2129e4950abbe1be053bc814d5da8", | |
| 1520 "c3331a8ba7a757f3d423735ab7fa81f9", | |
| 1521 "746f808582156734dd6b6fdfd3a0b72c", | |
| 1522 "8075ea2b227a70c60ea6b7b75a6bb190", | |
| 1523 "806b8b3e300c615099c11a5ec23465aa", | |
| 1524 "7c836aa298ba6eef96434579af631a11", | |
| 1525 "a0357dc9f4f72d73a885c33d7c287446", | |
| 1526 "f25ba3be1cc7d7fad95706adc199ea7d", | |
| 1527 "8b114c526b8cbed6cad8a3248b7b480c", | |
| 1528 "44e6670f127e612a2b4aa60a0d207698", | |
| 1529 "b8945f90fe02facf2ace24ca1ecbe0a5", | |
| 1530 "95c796c2fa8f59018b15cf2987b1f79b", | |
| 1531 "ce0a51ab30224205b44920221dc27351", # Frame 23 | |
| 1532 ] | |
| 1533 | |
| 1534 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 1535 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/preview' % s)) | |
| 1536 | |
| 1537 for i in range(len(a)): | |
| 1538 self.assertEqual(a[i], ComputeMD5(DoGet(_REMOTE, '/instances/%s/frames/%d/preview' % (s, i)))) | |
| 1539 | |
| 1540 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1541 def test_googlecode_issue_19(self): |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
1542 # This is an image with "YBR_FULL" photometric interpretation, it is not supported by Orthanc |
| 13 | 1543 # gdcmconv -i /home/jodogne/DICOM/GdcmDatabase/US_DataSet/HDI5000_US/3EAF5E01 -w -o Issue19.dcm |
| 1544 | |
| 1545 a = UploadInstance(_REMOTE, 'Issue19.dcm')['ID'] | |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
1546 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/941ad3c8-05d05b88-560459f9-0eae0e20-6cddd533/preview')) |
| 13 | 1547 |
| 1548 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
1549 def test_googlecode_issue_37(self): |
| 13 | 1550 # Same test for issues 35 and 37. Fixed in Orthanc 0.9.1 |
| 1551 u = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID'] | |
| 1552 | |
| 1553 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 1554 'CaseSensitive' : True, | |
| 1555 'Query' : { 'StationName' : 'SMR4-MP3' }}) | |
| 1556 self.assertEqual(1, len(a)) | |
| 14 | 1557 |
| 1558 | |
| 1559 def test_rest_find(self): | |
| 1560 # Upload 8 instances | |
| 1561 for i in range(2): | |
| 1562 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 1563 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 1564 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 1565 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 1566 | |
| 1567 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 1568 'CaseSensitive' : False, | |
| 1569 'Query' : { 'PatientName' : '*n*' }}) | |
| 1570 self.assertEqual(2, len(a)) | |
| 1571 | |
| 1572 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 1573 'CaseSensitive' : True, | |
| 1574 'Query' : { 'PatientName' : '*n*' }}) | |
| 1575 self.assertEqual(0, len(a)) | |
| 1576 | |
| 1577 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True, | |
| 1578 'Level' : 'Patient', | |
| 1579 'CaseSensitive' : False, | |
| 1580 'Query' : { 'PatientName' : '*ne*' }}) | |
| 1581 self.assertEqual(1, len(a)) | |
| 1582 self.assertEqual('20080822', a[0]['MainDicomTags']['PatientBirthDate']) | |
| 1583 | |
| 1584 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', | |
| 1585 'CaseSensitive' : True, | |
| 1586 'Query' : { 'PatientName' : '*ne*' }}) | |
| 1587 self.assertEqual(0, len(a)) | |
| 1588 | |
| 1589 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', | |
| 1590 'CaseSensitive' : True, | |
| 1591 'Query' : { 'PatientName' : '*NE*' }}) | |
| 1592 self.assertEqual(1, len(a)) | |
| 1593 | |
| 1594 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', | |
| 1595 'CaseSensitive' : True, | |
| 1596 'Query' : { 'PatientName' : '*NE*' }}) | |
| 1597 self.assertEqual(2, len(a)) | |
| 1598 | |
| 1599 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', | |
| 1600 'CaseSensitive' : True, | |
| 1601 'Query' : { 'PatientName' : '*NE*' }}) | |
| 1602 self.assertEqual(4, len(a)) | |
| 1603 | |
| 1604 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', 'Query' : { }}) | |
| 1605 self.assertEqual(2, len(a)) | |
| 1606 | |
| 1607 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', 'Query' : { }}) | |
| 1608 self.assertEqual(2, len(a)) | |
| 1609 | |
| 1610 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', 'Query' : { }}) | |
| 1611 self.assertEqual(4, len(a)) | |
| 1612 | |
| 1613 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', 'Query' : { }}) | |
| 1614 self.assertEqual(8, len(a)) | |
| 1615 | |
| 1616 | |
| 1617 def test_rest_query_retrieve(self): | |
| 1618 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 1619 | |
| 1620 # Upload 8 instances | |
| 1621 for i in range(2): | |
| 1622 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) | |
| 1623 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) | |
| 1624 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) | |
| 1625 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) | |
| 1626 | |
| 1627 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 1628 for p in DoGet(_REMOTE, '/patients'): | |
| 1629 DoPost(_REMOTE, '/modalities/orthanctest/store', p) | |
| 1630 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 1631 | |
| 1632 for q in DoGet(_REMOTE, '/queries'): | |
| 1633 DoDelete(_REMOTE, '/queries/%s' % q) | |
| 1634 | |
| 1635 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 1636 self.assertEqual(0, len(DoGet(_REMOTE, '/queries'))) | |
| 1637 a = DoPost(_REMOTE, '/modalities/orthanctest/query', { 'Level' : 'Series', | |
| 27 | 1638 'Query' : { |
| 1639 'PatientName' : '*NE*', | |
| 1640 'StudyDate' : '*', | |
| 1641 }})['ID'] | |
| 14 | 1642 self.assertEqual(1, len(DoGet(_REMOTE, '/queries'))) |
| 1643 | |
| 1644 b = DoGet(_REMOTE, '/queries/%s' % a) | |
| 1645 self.assertTrue('answers' in b) | |
| 1646 self.assertTrue('level' in b) | |
| 1647 self.assertTrue('modality' in b) | |
| 1648 self.assertTrue('query' in b) | |
| 1649 self.assertTrue('retrieve' in b) | |
| 1650 self.assertEqual('Series', DoGet(_REMOTE, '/queries/%s/level' % a)) | |
| 1651 self.assertEqual('orthanctest', DoGet(_REMOTE, '/queries/%s/modality' % a)) | |
| 1652 | |
| 1653 q = DoGet(_REMOTE, '/queries/%s/query?simplify' % a) | |
| 27 | 1654 self.assertEqual(2, len(q)) |
| 14 | 1655 self.assertTrue('PatientName' in q) |
| 27 | 1656 self.assertTrue('StudyDate' in q) |
| 14 | 1657 self.assertEqual('*NE*', q['PatientName']) |
| 27 | 1658 self.assertEqual('*', q['StudyDate']) |
| 14 | 1659 |
| 1660 self.assertEqual(2, len(DoGet(_REMOTE, '/queries/%s/answers' % a))) | |
| 1661 | |
| 1662 s = DoGet(_REMOTE, '/queries/%s/answers/0' % a) | |
| 1663 self.assertTrue('content' in s) | |
| 1664 self.assertTrue('retrieve' in s) | |
| 1665 | |
| 1666 s = DoGet(_REMOTE, '/queries/%s/answers/0/content?simplify' % a) | |
| 1667 self.assertEqual('887', s['PatientID']) | |
| 1668 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', s['StudyInstanceUID']) | |
| 1669 | |
| 1670 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 1671 DoPost(_REMOTE, '/queries/%s/answers/0/retrieve' % a, 'ORTHANC') | |
| 1672 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 1673 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 1674 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 1675 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) | |
| 1676 | |
| 112 | 1677 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 | 1678 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) |
| 1679 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 1680 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 1681 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) | |
| 1682 | |
| 1683 DoDelete(_REMOTE, '/queries/%s' % a) | |
| 1684 self.assertEqual(0, len(DoGet(_REMOTE, '/queries'))) | |
| 1685 | |
| 1686 | |
| 1687 def test_parent(self): | |
| 1688 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1689 patient = '6816cb19-844d5aee-85245eba-28e841e6-2414fae2' | |
| 1690 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' | |
| 1691 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 1692 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d' | |
|
107
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
1693 self.assertEqual(instance, u) |
| 14 | 1694 |
| 1695 a = DoGet(_REMOTE, '/studies/%s/patient' % study) | |
| 1696 self.assertEqual('Patient', a['Type']) | |
| 1697 self.assertEqual(patient, a['ID']) | |
| 1698 | |
| 1699 a = DoGet(_REMOTE, '/series/%s/patient' % series) | |
| 1700 self.assertEqual('Patient', a['Type']) | |
| 1701 self.assertEqual(patient, a['ID']) | |
| 1702 | |
| 1703 a = DoGet(_REMOTE, '/series/%s/study' % series) | |
| 1704 self.assertEqual('Study', a['Type']) | |
| 1705 self.assertEqual(study, a['ID']) | |
| 1706 | |
| 1707 a = DoGet(_REMOTE, '/instances/%s/patient' % instance) | |
| 1708 self.assertEqual('Patient', a['Type']) | |
| 1709 self.assertEqual(patient, a['ID']) | |
| 1710 | |
| 1711 a = DoGet(_REMOTE, '/instances/%s/study' % instance) | |
| 1712 self.assertEqual('Study', a['Type']) | |
| 1713 self.assertEqual(study, a['ID']) | |
| 1714 | |
| 1715 a = DoGet(_REMOTE, '/instances/%s/series' % instance) | |
| 1716 self.assertEqual('Series', a['Type']) | |
| 1717 self.assertEqual(series, a['ID']) | |
| 1718 | |
| 1719 | |
| 1720 def test_shanon(self): | |
| 1721 def Anonymize(instance, replacements = {}): | |
| 119 | 1722 return DoPost(_REMOTE, '/instances/%s/anonymize' % instance, { |
| 1723 'Replace' : replacements, | |
| 1724 'Force' : True, | |
| 1725 }, 'application/json') | |
| 14 | 1726 |
| 1727 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 1728 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1729 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 1730 | |
| 1731 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ] | |
| 1732 ids = [ 'ozp00SjY2xG', | |
| 1733 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 1734 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 1735 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ] | |
| 1736 | |
| 1737 a = ExtractDicomTags(Anonymize(u), tags) | |
| 1738 for i in range(4): | |
| 1739 self.assertNotEqual(ids[i], a[i]) | |
| 1740 self.assertTrue(a[4].startswith('Orthanc')) | |
| 1741 | |
| 1742 a = ExtractDicomTags(Anonymize(u, { 'PatientName' : 'toto' }), tags) | |
| 1743 for i in range(4): | |
| 1744 self.assertNotEqual(ids[i], a[i]) | |
| 1745 self.assertFalse(a[4].startswith('Orthanc')) | |
| 1746 | |
| 1747 a = ExtractDicomTags(Anonymize(u, { 'SOPInstanceUID' : 'instance' }), tags) | |
| 1748 self.assertEqual('instance', a[3]) | |
| 1749 self.assertFalse(a[4].startswith('Orthanc')) | |
| 1750 | |
| 1751 a = ExtractDicomTags(Anonymize(u, { 'SeriesInstanceUID' : 'series' }), tags) | |
| 1752 self.assertEqual('series', a[2]) | |
| 1753 self.assertFalse(a[4].startswith('Orthanc')) | |
| 1754 | |
| 1755 a = ExtractDicomTags(Anonymize(u, { 'StudyInstanceUID' : 'study' }), tags) | |
| 1756 self.assertEqual('study', a[1]) | |
| 1757 self.assertFalse(a[4].startswith('Orthanc')) | |
| 1758 | |
| 1759 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient' }), tags) | |
| 1760 self.assertEqual('patient', a[0]) | |
| 1761 self.assertFalse(a[4].startswith('Orthanc')) | |
| 1762 | |
| 1763 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient', | |
| 1764 'StudyInstanceUID' : 'study', | |
| 1765 'SeriesInstanceUID' : 'series', | |
| 1766 'SOPInstanceUID' : 'instance' }), tags) | |
| 1767 self.assertEqual('patient', a[0]) | |
| 1768 self.assertFalse(a[4].startswith('Orthanc')) | |
| 1769 | |
| 1770 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 1771 | |
| 1772 | |
| 1773 def test_shanon_2(self): | |
| 1774 def Modify(instance, replacements = {}): | |
| 119 | 1775 return DoPost(_REMOTE, '/instances/%s/modify' % instance, { |
| 1776 'Replace' : replacements, | |
| 1777 'Force': True, | |
| 1778 }, 'application/json') | |
| 14 | 1779 |
| 1780 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) | |
| 1781 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 1782 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 1783 | |
| 1784 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ] | |
| 1785 ids = [ 'ozp00SjY2xG', | |
| 1786 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', | |
| 1787 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', | |
| 1788 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ] | |
| 1789 | |
| 1790 a = ExtractDicomTags(Modify(u), tags) | |
| 1791 self.assertEqual(ids[0], a[0]) | |
| 1792 self.assertEqual(ids[1], a[1]) | |
| 1793 self.assertEqual(ids[2], a[2]) | |
| 1794 self.assertNotEqual(ids[3], a[3]) | |
| 1795 self.assertEqual(0, len(a[4])) | |
| 1796 | |
| 1797 a = ExtractDicomTags(Modify(u, { 'SOPInstanceUID' : 'instance' }), tags) | |
| 1798 self.assertEqual(ids[0], a[0]) | |
| 1799 self.assertEqual(ids[1], a[1]) | |
| 1800 self.assertEqual(ids[2], a[2]) | |
| 1801 self.assertEqual('instance', a[3]) | |
| 1802 | |
| 1803 a = ExtractDicomTags(Modify(u, { 'SeriesInstanceUID' : 'series' }), tags) | |
| 1804 self.assertEqual(ids[0], a[0]) | |
| 1805 self.assertEqual(ids[1], a[1]) | |
| 1806 self.assertEqual('series', a[2]) | |
| 1807 self.assertNotEqual(ids[3], a[3]) | |
| 1808 | |
| 1809 a = ExtractDicomTags(Modify(u, { 'StudyInstanceUID' : 'study' }), tags) | |
| 1810 self.assertEqual(ids[0], a[0]) | |
| 1811 self.assertEqual('study', a[1]) | |
| 1812 self.assertNotEqual(ids[2], a[2]) | |
| 1813 self.assertNotEqual(ids[3], a[3]) | |
| 1814 | |
| 1815 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient' }), tags) | |
| 1816 self.assertEqual('patient', a[0]) | |
| 1817 self.assertNotEqual(ids[1], a[1]) | |
| 1818 self.assertNotEqual(ids[2], a[2]) | |
| 1819 self.assertNotEqual(ids[3], a[3]) | |
| 1820 | |
| 1821 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient', | |
| 1822 'StudyInstanceUID' : 'study', | |
| 1823 'SeriesInstanceUID' : 'series', | |
| 1824 'SOPInstanceUID' : 'instance' }), tags) | |
| 1825 self.assertEqual('patient', a[0]) | |
| 1826 self.assertEqual('study', a[1]) | |
| 1827 self.assertEqual('series', a[2]) | |
| 1828 self.assertEqual('instance', a[3]) | |
| 1829 | |
| 1830 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 1831 | |
| 1832 | |
| 1833 def test_instances_tags(self): | |
| 1834 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] | |
| 1835 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')['ID'] | |
| 1836 #a = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386937.676343')['ID'] | |
| 1837 #b = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386925.676329')['ID'] | |
| 1838 | |
| 1839 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/patients')[0]) | |
| 1840 self.assertEqual(2, len(i)) | |
| 1841 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 1842 self.assertEqual('887', i[i.keys()[1]]['PatientID']) | |
| 1843 | |
| 1844 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/studies')[0]) | |
| 1845 self.assertEqual(2, len(i)) | |
| 1846 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 1847 self.assertEqual('887', i[i.keys()[1]]['PatientID']) | |
| 1848 | |
| 1849 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 1850 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[0]) | |
| 1851 self.assertEqual(1, len(i)) | |
| 1852 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 1853 | |
| 1854 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[1]) | |
| 1855 self.assertEqual(1, len(i)) | |
| 1856 self.assertEqual('887', i[i.keys()[0]]['PatientID']) | |
| 1857 | |
|
136
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
1858 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
|
1859 self.assertEqual(1, len(i)) |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
1860 self.assertEqual('887', i[i.keys()[0]]['0010,0020']) |
|
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
1861 |
| 14 | 1862 |
| 1863 def test_lookup(self): | |
| 1864 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG') | |
| 1865 self.assertEqual(0, len(a)) | |
| 1866 | |
| 1867 UploadInstance(_REMOTE, 'DummyCT.dcm') | |
| 1868 | |
| 1869 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG') | |
| 1870 self.assertEqual(1, len(a)) | |
| 1871 self.assertEqual('Patient', a[0]['Type']) | |
| 1872 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', a[0]['ID']) | |
| 1873 self.assertEqual('/patients/%s' % a[0]['ID'], a[0]['Path']) | |
| 1874 | |
| 1875 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390') | |
| 1876 self.assertEqual(1, len(a)) | |
| 1877 self.assertEqual('Study', a[0]['Type']) | |
| 1878 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', a[0]['ID']) | |
| 1879 self.assertEqual('/studies/%s' % a[0]['ID'], a[0]['Path']) | |
| 1880 | |
| 1881 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394') | |
| 1882 self.assertEqual(1, len(a)) | |
| 1883 self.assertEqual('Series', a[0]['Type']) | |
| 1884 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', a[0]['ID']) | |
| 1885 self.assertEqual('/series/%s' % a[0]['ID'], a[0]['Path']) | |
| 1886 | |
| 1887 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109') | |
| 1888 self.assertEqual(1, len(a)) | |
| 1889 self.assertEqual('Instance', a[0]['Type']) | |
| 1890 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a[0]['ID']) | |
| 1891 self.assertEqual('/instances/%s' % a[0]['ID'], a[0]['Path']) | |
| 1892 | |
| 1893 DropOrthanc(_REMOTE) | |
| 1894 a = DoPost(_REMOTE, '/tools/lookup', '3113719P') | |
| 1895 self.assertEqual(0, len(a)) | |
| 1896 | |
| 15 | 1897 |
| 1898 def test_autorouting(self): | |
| 1899 knee1 = 'Knee/T1/IM-0001-0001.dcm' | |
| 1900 knee2 = 'Knee/T2/IM-0001-0002.dcm' | |
| 1901 other = 'Brainix/Flair/IM-0001-0001.dcm' | |
| 1902 | |
| 1903 # Check that this version is >= 0.8.0 | |
| 1904 self.assertTrue(IsDefinedInLua(_REMOTE, '_InitializeJob')) | |
| 1905 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities')) | |
| 1906 | |
| 1907 UploadInstance(_REMOTE, knee1) | |
| 1908 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 1909 | |
| 1910 DropOrthanc(_REMOTE) | |
| 1911 DropOrthanc(_LOCAL) | |
| 174 | 1912 InstallLuaScriptFromPath(_REMOTE, 'Lua/Autorouting.lua') |
| 15 | 1913 UploadInstance(_REMOTE, knee1) |
| 1914 UploadInstance(_REMOTE, knee2) | |
| 1915 UploadInstance(_REMOTE, other) | |
| 1916 WaitEmpty(_REMOTE) | |
| 174 | 1917 UninstallLuaCallbacks(_REMOTE) |
| 15 | 1918 self.assertEqual(3, len(DoGet(_LOCAL, '/instances'))) |
| 1919 | |
| 1920 DropOrthanc(_REMOTE) | |
| 1921 DropOrthanc(_LOCAL) | |
| 174 | 1922 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingConditional.lua') |
| 15 | 1923 UploadInstance(_REMOTE, knee1) |
| 1924 UploadInstance(_REMOTE, knee2) | |
| 1925 UploadInstance(_REMOTE, other) | |
| 1926 WaitEmpty(_REMOTE) | |
| 174 | 1927 UninstallLuaCallbacks(_REMOTE) |
| 15 | 1928 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
| 1929 | |
| 1930 DropOrthanc(_REMOTE) | |
| 1931 DropOrthanc(_LOCAL) | |
| 174 | 1932 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingModification.lua') |
| 15 | 1933 UploadInstance(_REMOTE, knee1) |
| 1934 WaitEmpty(_REMOTE) | |
| 174 | 1935 UninstallLuaCallbacks(_REMOTE) |
| 15 | 1936 i = DoGet(_LOCAL, '/instances') |
| 1937 self.assertEqual(1, len(i)) | |
| 1938 | |
| 1939 with tempfile.NamedTemporaryFile(delete = True) as f: | |
| 1940 f.write(DoGet(_LOCAL, '/instances/%s/file' % i[0])) | |
| 1941 f.flush() | |
| 45 | 1942 routed = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ]) |
| 15 | 1943 self.assertEqual('My Medical Device', re.search('"StationName">(.*?)<', routed).group(1).strip()) |
| 1944 self.assertEqual(None, re.search('"MilitaryRank"', routed)) | |
| 1945 self.assertEqual(None, re.search('"0051,0010"', routed)) # A private tag | |
| 17 | 1946 |
| 1947 | |
| 1948 def test_storescu_rf(self): | |
| 1949 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] | |
| 1950 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) | |
| 1951 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') | |
| 1952 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) | |
| 18 | 1953 |
| 1954 | |
| 1955 def test_anonymize_instance(self): | |
| 1956 def AnonymizeAndUpload(instanceId, parameters): | |
| 1957 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/anonymize' % instanceId, parameters, | |
| 1958 'application/json'), 'application/dicom')['ID'] | |
| 1959 | |
| 1960 def ModifyAndUpload(instanceId, parameters): | |
| 1961 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/modify' % instanceId, parameters, | |
| 1962 'application/json'), 'application/dicom')['ID'] | |
| 1963 | |
| 1964 a = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] | |
| 1965 s1 = DoGet(_REMOTE, '/instances/%s/content/PatientName' % a) | |
| 1966 s2 = DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % a) # Some private tag | |
| 1967 s3 = DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % a) | |
| 1968 s4 = DoGet(_REMOTE, '/instances/%s/content/SeriesDescription' % a) | |
| 1969 s5 = DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a) | |
| 1970 | |
| 1971 b = AnonymizeAndUpload(a, '{}') | |
| 1972 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 1973 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 1974 | |
| 1975 # Keep private tag (only OK since Orthanc 0.8.0) | |
| 1976 b = AnonymizeAndUpload(a, '{"Keep":["00e1-10c2"]}') | |
| 1977 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 1978 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 1979 | |
| 1980 b = AnonymizeAndUpload(a, '{"Keep":["00e1,10c2","PatientName"]}') | |
| 1981 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 1982 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 1983 | |
| 1984 b = AnonymizeAndUpload(a, '{"Keep":["PatientName"],"Replace":{"00e1,10c2":"Hello"}}') | |
| 1985 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b)) | |
| 1986 self.assertTrue(DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b).startswith('Hello')) | |
| 1987 | |
| 1988 # Examples from the Wiki | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
1989 b = AnonymizeAndUpload(a, '{"Replace":{"PatientName":"hello","0010-0020":"world"},"Keep":["StudyDescription", "SeriesDescription"],"KeepPrivateTags": true,"Force":true}') |
| 18 | 1990 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip()) |
| 1991 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip()) | |
| 1992 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b)) | |
| 1993 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b)) | |
| 1994 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b)) | |
| 1995 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 1996 DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a) | |
| 1997 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 1998 | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
1999 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Remove":["InstitutionName"],"RemovePrivateTags": true,"Force":true}') |
| 18 | 2000 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip()) |
| 2001 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip()) | |
| 2002 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b)) | |
| 2003 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b)) | |
| 2004 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b)) | |
| 2005 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 2006 | |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
2007 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Force":true}') |
| 18 | 2008 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip()) |
| 2009 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip()) | |
| 2010 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1,10c2' % b)) | |
| 2011 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b)) | |
| 2012 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b)) | |
| 2013 self.assertEqual(s5, DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b)) | |
| 2014 | |
| 2015 | |
| 2016 # Test modify non-existing | |
| 2017 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2018 json.dumps({ | |
| 2019 'PatientName' : 'Jodogne', | |
| 2020 'Modality' : 'CT', | |
| 2021 }))['ID'] | |
| 2022 | |
| 2023 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i).strip()) | |
| 2024 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % i)) | |
| 2025 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i).strip()) | |
| 2026 | |
| 2027 b = ModifyAndUpload(i, '{"Replace":{"StudyDescription":"hello","Modality":"world"}}') | |
| 2028 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % b).strip()) | |
| 2029 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % b).strip()) | |
| 2030 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/Modality' % b).strip()) | |
| 2031 | |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2032 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2033 def test_incoming_jpeg(self): |
|
61
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2034 def storescu(image, acceptUnknownSopClassUid): |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2035 if acceptUnknownSopClassUid: |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2036 tmp = [ '-xf', GetDatabasePath('UnknownSopClassUid.cfg'), 'Default' ] |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2037 else: |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2038 tmp = [ '-xs' ] |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2039 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2040 with open(os.devnull, 'w') as FNULL: |
|
61
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2041 subprocess.check_call([ FindExecutable('storescu') ] + tmp + |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2042 [ _REMOTE['Server'], str(_REMOTE['DicomPort']), |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2043 GetDatabasePath(image) ], |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2044 stderr = FNULL) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2045 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2046 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
| 174 | 2047 InstallLuaScriptFromPath(_REMOTE, 'Lua/TransferSyntaxDisable.lua') |
|
61
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2048 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
|
2049 self.assertRaises(Exception, lambda: storescu('UnknownSopClassUid.dcm', True)) |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2050 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
| 174 | 2051 InstallLuaScriptFromPath(_REMOTE, 'Lua/TransferSyntaxEnable.lua') |
|
62
f9c4ce95756f
removal of useless information
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
61
diff
changeset
|
2052 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
|
2053 storescu('Knix/Loc/IM-0001-0001.dcm', False) |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2054 storescu('UnknownSopClassUid.dcm', True) |
|
967d44407308
test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
60
diff
changeset
|
2055 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2056 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2057 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2058 def test_storescu_jpeg(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2059 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2060 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2061 knixStudy = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' |
| 64 | 2062 i = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm')['ID'] |
| 2063 | |
| 2064 # This is JPEG lossless | |
|
136
5634ef96fcc5
testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
2065 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header' % i)['0002,0010']['Value']) |
| 64 | 2066 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
|
2067 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header?short' % i)['0002,0010']) |
| 64 | 2068 |
|
21
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2069 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm') |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2070 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0003.dcm') |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2071 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2072 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
|
2073 b = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2074 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2075 DoPost(_REMOTE, '/modalities/orthanctest/store', [ knixStudy, a, b ]) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2076 self.assertEqual(5, len(DoGet(_LOCAL, '/instances'))) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2077 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2078 self.assertEqual(3, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2079 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2080 DropOrthanc(_REMOTE) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2081 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2082 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2083 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2084 def test_pixel_data(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2085 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
|
2086 color = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2087 phenix = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2088 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2089 phenixSize = 358 * 512 * 2 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2090 colorSize = 1000 * 1000 * 3 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2091 jpegSize = 51918 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2092 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2093 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
|
2094 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
|
2095 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
|
2096 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2097 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
|
2098 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
|
2099 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2100 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
|
2101 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
|
2102 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2103 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2104 def test_decode_brainix(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2105 brainix = [ |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2106 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'], # (*) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2107 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
|
2108 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
|
2109 ] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2110 h = '6fb11b932d535c2be04beabd99793ff8' |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2111 maxValue = 426.0 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2112 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2113 truth = Image.open(GetDatabasePath('Formats/Brainix.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2114 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2115 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2116 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2117 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2118 truth2 = map(lambda x: min(255, x), truth.getdata()) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2119 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2120 self.AssertSameImages(truth2, '/instances/%s/image-uint8' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2121 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2122 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
|
2123 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2124 self.AssertSameImages(truth2, '/instances/%s/preview' % i) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2125 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2126 for i in brainix: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2127 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
|
2128 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2129 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2130 def test_decode_color(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2131 imagej = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2132 color = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2133 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2134 for i in [ imagej, color ]: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2135 for j in [ 'image-uint8', 'image-uint16', 'image-int16' ]: |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2136 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
|
2137 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2138 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
|
2139 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
|
2140 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2141 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
|
2142 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
|
2143 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2144 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2145 def test_decode_rf(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2146 rf = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2147 truth = Image.open(GetDatabasePath('Formats/KarstenHilbertRF.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2148 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2149 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2150 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2151 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2152 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % rf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2153 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2154 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
|
2155 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2156 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2157 def test_decode_multiframe(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2158 mf = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2159 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2160 # Test the first frame |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2161 truth = Image.open(GetDatabasePath('Formats/Multiframe0.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2162 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2163 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2164 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2165 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % mf) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2166 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
|
2167 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2168 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
|
2169 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2170 # Test the last frame |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2171 truth = Image.open(GetDatabasePath('Formats/Multiframe75.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2172 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
|
2173 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2174 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2175 def test_decode_signed(self): |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2176 signed = UploadInstance(_REMOTE, 'SignedCT.dcm')['ID'] |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2177 minValue = -2000 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2178 maxValue = 4042 |
|
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 truth = Image.open(GetDatabasePath('Formats/SignedCT.png')) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2181 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2182 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2183 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
|
2184 self.AssertSameImages(truth2, '/instances/%s/image-uint16' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2185 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2186 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
|
2187 self.AssertSameImages(truth3, '/instances/%s/image-uint8' % signed) |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2188 |
|
2a29bcff60a7
tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
18
diff
changeset
|
2189 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
|
2190 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
|
2191 self.AssertSameImages(tmp, '/instances/%s/preview' % signed) |
|
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('b57e6c872a3da50877c7da689b03a444', ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % signed))) |
| 22 | 2194 |
| 2195 | |
|
46
85b2e36ed392
explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
45
diff
changeset
|
2196 def test_googlecode_issue_32(self): |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2197 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/default-encoding', 'nope')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2198 self.assertEqual('Windows1251', DoPut(_REMOTE, '/tools/default-encoding', 'Windows1251')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2199 self.assertEqual('Windows1251', DoGet(_REMOTE, '/tools/default-encoding')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2200 |
| 22 | 2201 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID'] |
| 2202 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f) | |
| 2203 self.assertEqual(u'Рентгенография', tags['SeriesDescription']) | |
| 2204 self.assertEqual(u'Таз', tags['BodyPartExamined']) | |
| 2205 self.assertEqual(u'Прямая', tags['ViewPosition']) | |
| 2206 | |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2207 # 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
|
2208 self.assertEqual('Latin1', DoPut(_REMOTE, '/tools/default-encoding', 'Latin1')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2209 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2210 DoDelete(_REMOTE, '/instances/%s' % f) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2211 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID'] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2212 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2213 self.assertNotEqual(u'Рентгенография', tags['SeriesDescription']) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2214 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
2215 |
| 22 | 2216 def test_encodings(self): |
| 23 | 2217 # Latin-1 (ISO_IR 100) |
| 22 | 2218 brainix = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
| 2219 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % brainix) | |
| 2220 self.assertEqual(u'IRM cérébrale, neuro-crâne', tags['StudyDescription']) | |
| 23 | 2221 |
| 2222 # Latin-2 (ISO_IR 101) | |
| 2223 a = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID'] | |
| 2224 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % a) | |
| 2225 # dcm2xml MarekLatin2.dcm | iconv -f latin2 -t utf-8 | xmllint --format - | |
| 2226 self.assertEqual('Imię i Nazwisko osoby opisującej', | |
| 2227 i['ContentSequence'][4]['ConceptNameCodeSequence'][0]['CodeMeaning'].encode('utf-8')) | |
| 2228 | |
|
26
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2229 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2230 def test_storescu_custom_aet(self): |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2231 # 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
|
2232 # 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
|
2233 # in the REST API)." |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2234 # 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
|
2235 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2236 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2237 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2238 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2239 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2240 c = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0003.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2241 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2242 j = DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2243 'LocalAet' : 'YOP', |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2244 'Resources' : [ a['ID'], b['ID'] ] |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2245 }) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2246 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2247 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2248 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
|
2249 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2250 DropOrthanc(_LOCAL) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2251 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2252 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2253 j = DoPost(_REMOTE, '/modalities/orthanctest/store', { |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2254 'Resources' : [ c['ID'] ] |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2255 }) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2256 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2257 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2258 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
|
2259 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2260 DropOrthanc(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2261 DropOrthanc(_LOCAL) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2262 |
| 174 | 2263 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingChangeAet.lua') |
|
26
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2264 DoPost(_REMOTE, '/tools/execute-script', 'aet = "HELLO"', 'application/lua') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2265 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2266 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2267 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2268 WaitEmpty(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2269 self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2270 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
|
2271 |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2272 DoPost(_REMOTE, '/tools/execute-script', 'aet = nill', 'application/lua') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2273 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2274 WaitEmpty(_REMOTE) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2275 self.assertEqual(2, len(DoGet(_LOCAL, '/instances'))) |
|
040f6ef1394a
test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
2276 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
|
2277 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2278 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
|
2279 # 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
|
2280 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
|
2281 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
|
2282 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
|
2283 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
|
2284 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
|
2285 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2286 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
|
2287 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
|
2288 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
|
2289 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
|
2290 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2291 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
|
2292 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
|
2293 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2294 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
|
2295 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
|
2296 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
|
2297 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
|
2298 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
|
2299 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
|
2300 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
|
2301 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
|
2302 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
|
2303 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
|
2304 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
|
2305 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
|
2306 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
|
2307 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
|
2308 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
|
2309 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2310 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
|
2311 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
|
2312 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
|
2313 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
|
2314 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
|
2315 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
|
2316 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
|
2317 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2318 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
|
2319 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
|
2320 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
|
2321 |
|
1047d7bc5210
test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
28
diff
changeset
|
2322 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
|
2323 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
|
2324 self.assertTrue(instance in s) |
| 36 | 2325 |
| 2326 | |
| 2327 def test_create_pdf(self): | |
| 2328 # Upload 4 instances | |
| 2329 brainixInstance = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] | |
| 2330 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 2331 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 2332 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 2333 | |
| 2334 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0' | |
| 2335 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' | |
| 2336 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8' | |
| 2337 | |
| 2338 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f: | |
| 2339 pdf = f.read() | |
| 2340 | |
| 2341 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2342 json.dumps({ | |
| 2343 'Tags' : { | |
| 2344 'PatientName' : 'Jodogne', | |
| 2345 'Modality' : 'CT', | |
| 2346 }, | |
| 2347 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 2348 })) | |
| 2349 | |
| 2350 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 2351 self.assertEqual('OT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip()) | |
| 2352 | |
| 2353 b = DoGet(_REMOTE, '/instances/%s/content/0042-0011' % i['ID']) | |
| 2354 self.assertEqual(len(b), len(pdf) + 1) | |
| 2355 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf + '\0')) | |
| 2356 | |
| 2357 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/tools/create-dicom', | |
| 2358 json.dumps({ | |
| 2359 'Parent' : brainixPatient, | |
| 2360 'Tags' : { | |
| 2361 'PatientName' : 'Jodogne', | |
| 2362 } | |
| 2363 }))) | |
| 2364 | |
| 2365 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2366 json.dumps({ | |
| 2367 'Parent' : brainixPatient, | |
| 2368 'Tags' : { 'StudyDescription' : 'PDF^Patient' }, | |
| 2369 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 2370 })) | |
| 2371 | |
| 2372 self.assertEqual(brainixPatient, DoGet(_REMOTE, '/instances/%s/patient' % i['ID'])['ID']) | |
| 2373 | |
| 2374 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2375 json.dumps({ | |
| 2376 'Parent' : brainixStudy, | |
| 2377 'Tags' : { 'SeriesDescription' : 'PDF^Study' }, | |
| 2378 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) | |
| 2379 })) | |
| 2380 | |
| 2381 self.assertEqual(brainixStudy, DoGet(_REMOTE, '/instances/%s/study' % i['ID'])['ID']) | |
| 2382 | |
| 2383 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2384 json.dumps({ | |
| 2385 'Parent' : brainixEpi, | |
| 37 | 2386 'Tags' : { 'SpecificCharacterSet' : 'ISO_IR 13' }, |
| 36 | 2387 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf) |
| 2388 })) | |
| 2389 | |
| 2390 self.assertEqual(brainixEpi, DoGet(_REMOTE, '/instances/%s/series' % i['ID'])['ID']) | |
| 2391 | |
| 2392 b = DoGet(_REMOTE, '/instances/%s/pdf' % i['ID']) | |
| 2393 self.assertEqual(len(b), len(pdf)) | |
| 2394 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf)) | |
| 2395 | |
| 2396 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/pdf' % brainixInstance)) | |
| 38 | 2397 |
| 2398 | |
| 2399 def test_create_series(self): | |
| 2400 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2401 json.dumps({ | |
| 2402 'Tags' : { | |
| 40 | 2403 'SpecificCharacterSet' : 'ISO_IR 100', |
| 2404 'PatientName' : 'Sébastien Jodogne', | |
| 38 | 2405 'Modality' : 'CT', |
| 2406 }, | |
| 2407 'Content' : [ | |
| 40 | 2408 { |
| 2409 'Content': 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==', # red dot in RGBA | |
| 2410 'Tags' : { 'ImageComments' : 'Tutu' } | |
| 2411 }, | |
| 38 | 2412 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAoUlEQVQ4jZ2SWw3EIBREjwUsYAELa2EtoAULFUCyXAtroRZqoRbox254BdLC/DZnZjoXWJFgCDg8egW2CBEhEnDzyRk+Ecxz2KP/0AL8S99T+jQccAVs22qKwAuPuq0uyNg9cPLh3am+pe/dkHLZtqJHj6vXJrZ7nvzvxxgemXgUwnGfXqpee09mUwp8m022OYP6bLF7mVuVe0y/umxinsAXRd9z0k1ubWsAAAAASUVORK5CYII=', |
| 2413 ] | |
| 2414 })) | |
| 2415 | |
| 2416 s = DoGet(_REMOTE, i['Path']) | |
| 2417 self.assertEqual('Series', s['Type']) | |
| 2418 self.assertEqual(s['ID'], i['ID']) | |
| 2419 self.assertEqual(2, len(s['Instances'])) | |
| 39 | 2420 self.assertEqual(2, s['ExpectedNumberOfInstances']) |
| 2421 self.assertEqual('Complete', s['Status']) | |
| 40 | 2422 |
| 2423 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][0]) | |
| 2424 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][1]) | |
| 2425 self.assertTrue('ImageComments' in a or 'ImageComments' in b) | |
| 2426 if 'ImageComments' in a: | |
| 2427 self.assertEqual('Tutu', a['ImageComments']) | |
| 2428 else: | |
| 2429 self.assertEqual('Tutu', b['ImageComments']) | |
| 2430 | |
| 2431 patient = DoGet(_REMOTE, '/instances/%s/patient' % s['Instances'][0]) | |
| 2432 self.assertEqual(patient['MainDicomTags']['PatientName'].encode('utf-8'), | |
| 2433 'Sébastien Jodogne') | |
| 47 | 2434 |
| 2435 | |
| 2436 def test_create_binary(self): | |
| 2437 binary = ''.join(map(chr, range(256))) | |
| 2438 encoded = 'data:application/octet-stream;base64,' + base64.b64encode(binary) | |
| 2439 tags = { | |
| 2440 'PatientName' : 'Jodogne', | |
| 2441 '8899-8899' : encoded | |
| 2442 } | |
| 2443 | |
| 2444 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2445 json.dumps({ | |
| 2446 'Tags' : tags | |
| 2447 })) | |
| 2448 | |
| 2449 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 2450 self.assertEqual(binary, DoGet(_REMOTE, '/instances/%s/content/8899-8899' % i['ID']).strip()) | |
| 2451 | |
| 2452 i = DoPost(_REMOTE, '/tools/create-dicom', | |
| 2453 json.dumps({ | |
| 2454 'InterpretBinaryTags' : False, | |
| 2455 'Tags' : tags | |
| 2456 })) | |
| 2457 | |
| 2458 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) | |
| 2459 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
|
2460 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2461 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2462 def test_patient_ids_collision(self): |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2463 # 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
|
2464 # same PatientID |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2465 for i in range(3): |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2466 UploadInstance(_REMOTE, 'PatientIdsCollision/Image%d.dcm' % (i + 1)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2467 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2468 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2469 'Query' : { 'PatientName' : '*' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2470 self.assertEqual(1, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2471 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
|
2472 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2473 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2474 'CaseSensitive' : True, |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2475 'Query' : { 'PatientName' : 'FOO\\HELLO' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2476 self.assertEqual(2, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2477 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2478 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2479 'CaseSensitive' : False, |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2480 'Query' : { 'PatientName' : 'Foo' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2481 self.assertEqual(1, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2482 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
|
2483 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
|
2484 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
|
2485 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2486 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2487 'Query' : { 'PatientName' : '*' }}) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2488 self.assertEqual(3, len(a)) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2489 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
|
2490 self.assertTrue('FOO^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2491 self.assertTrue('HELLO^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2492 self.assertTrue('WORLD^SERIES' in d) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2493 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2494 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
|
2495 self.assertEqual(1, len(set(d))) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2496 self.assertEqual('COMMON', d[0]) |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2497 |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2498 for i in a: |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2499 d = DoGet(_REMOTE, '/studies/%s' % i) ['MainDicomTags']['StudyDescription'] |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2500 p = DoGet(_REMOTE, '/studies/%s' % i) ['PatientMainDicomTags']['PatientName'] |
|
e4352463ff74
test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
47
diff
changeset
|
2501 self.assertEqual('%s^SERIES' % p, d) |
|
49
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2502 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2503 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2504 def test_bitbucket_issue_4(self): |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2505 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2506 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2507 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2508 UploadInstance(_REMOTE, 'Formats/Jpeg.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2509 UploadInstance(_REMOTE, 'Formats/JpegLossless.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2510 UploadInstance(_REMOTE, 'Formats/Rle.dcm') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2511 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2512 self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2513 self.assertEqual(6, len(DoGet(_REMOTE, '/instances'))) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2514 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2515 p = DoGet(_REMOTE, '/patients') |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2516 self.assertEqual(2, len(p)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2517 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
|
2518 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
|
2519 self.assertEqual(3, len(i1)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2520 self.assertEqual(3, len(i2)) |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2521 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2522 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
|
2523 |
|
e7f9b8199545
test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
48
diff
changeset
|
2524 self.assertEqual(6, len(DoGet(_LOCAL, '/instances'))) |
|
50
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2525 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2526 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2527 def test_create_sequence(self): |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2528 i = DoPost(_REMOTE, '/tools/create-dicom', |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2529 json.dumps({ |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2530 'Tags' : { |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2531 'SpecificCharacterSet': 'ISO_IR 100', # Encode using Latin1 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2532 'PatientName': 'Jodogne^', |
|
51
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2533 'ReferencedStudySequence': GenerateTestSequence(), |
|
50
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2534 } |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2535 }))['ID'] |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2536 |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2537 self.assertEqual('Jodogne^', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i)) |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2538 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
|
2539 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
|
2540 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
|
2541 self.assertEqual(u'Sébastien^'.encode('latin-1'), |
|
8de63d56cf11
test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
49
diff
changeset
|
2542 DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence/1/StudyDescription' % i)) |
|
51
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2543 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2544 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2545 def test_modify_sequence(self): |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2546 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID'] |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2547 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
|
2548 |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2549 j = DoPost(_REMOTE, '/instances/%s/modify' % i, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2550 json.dumps({ |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2551 "Replace" : { |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2552 "PatientName" : "hello", |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2553 'ReferencedStudySequence': GenerateTestSequence(), |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2554 }, |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2555 }), |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2556 'application/json') |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2557 j = DoPost(_REMOTE, '/instances', j, 'application/dicom')['ID'] |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2558 DoDelete(_REMOTE, '/instances/%s' % i) |
|
264a20a0276d
test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
50
diff
changeset
|
2559 |
| 52 | 2560 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence' % j))) |
| 2561 | |
| 2562 | |
| 2563 def test_compression(self): | |
| 2564 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] | |
| 2565 | |
| 2566 data = DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom-as-json/data' % i)[1] | |
| 2567 | |
| 2568 # "StorageCompression" is enabled in the Orthanc to be tested, | |
| 2569 # uncompress the data before running the test | |
| 2570 if DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/is-compressed' % i) != 0: | |
| 2571 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/uncompress' % i) | |
| 2572 | |
| 2573 cs = DoGet(_REMOTE, '/statistics')['TotalDiskSize'] | |
| 2574 us = DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'] | |
| 2575 size = DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % i) | |
| 2576 md5 = DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/md5' % i) | |
| 2577 self.assertEqual(data, DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-data' % i)[1]) | |
| 2578 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-md5' % i)) | |
| 2579 self.assertEqual(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-size' % i)) | |
| 2580 | |
| 2581 ops = DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json' % i) | |
| 2582 self.assertTrue('compress' in ops) | |
| 2583 self.assertTrue('uncompress' in ops) | |
| 2584 self.assertTrue('is-compressed' in ops) | |
| 2585 self.assertEqual(0, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/is-compressed' % i)) | |
| 2586 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/verify-md5' % i) | |
| 2587 | |
| 2588 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/compress' % i) | |
| 2589 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/verify-md5' % i) | |
| 2590 self.assertEqual(1, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/is-compressed' % i)) | |
| 2591 self.assertLess(cs, DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 2592 self.assertEqual(us, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 2593 self.assertGreater(len(data), len(DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-data' % i)[1])) | |
| 2594 self.assertGreater(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-size' % i)) | |
| 2595 self.assertEqual(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % i)) | |
| 2596 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/md5' % i)) | |
| 2597 self.assertNotEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-md5' % i)) | |
| 2598 | |
| 2599 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/uncompress' % i) | |
| 2600 DoPost(_REMOTE, '/instances/%s/attachments/dicom-as-json/verify-md5' % i) | |
| 2601 self.assertEqual(0, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/is-compressed' % i)) | |
| 2602 self.assertEqual(data, DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-data' % i)[1]) | |
| 2603 self.assertEqual(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-size' % i)) | |
| 2604 self.assertEqual(size, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % i)) | |
| 2605 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/md5' % i)) | |
| 2606 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/compressed-md5' % i)) | |
| 2607 self.assertEqual(cs, DoGet(_REMOTE, '/statistics')['TotalDiskSize']) | |
| 2608 self.assertEqual(us, DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) | |
| 53 | 2609 |
| 2610 | |
| 2611 def test_ordered_slices(self): | |
| 2612 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] | |
| 2613 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 2614 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 2615 self.assertEqual('Sequence', o['Type']) | |
| 2616 self.assertEqual(1, len(o['Dicom'])) | |
| 2617 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/file', o['Dicom'][0]) | |
| 2618 self.assertEqual(76, len(o['Slices'])) | |
| 2619 for j in range(76): | |
| 2620 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/frames/%d' % j, o['Slices'][j]) | |
| 2621 | |
| 68 | 2622 self.assertEqual(1, len(o['SlicesShort'])) |
| 2623 self.assertEqual('9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02', o['SlicesShort'][0][0]) | |
| 2624 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 2625 self.assertEqual(76, o['SlicesShort'][0][2]) | |
| 2626 | |
| 53 | 2627 i = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
| 2628 j = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')['ID'] | |
| 2629 k = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')['ID'] | |
| 2630 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 2631 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 2632 | |
| 2633 self.assertEqual('Volume', o['Type']) | |
| 2634 self.assertEqual(3, len(o['Dicom'])) | |
| 2635 self.assertEqual(3, len(o['Slices'])) | |
| 2636 self.assertEqual('/instances/%s/file' % i, o['Dicom'][2]) | |
| 2637 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1]) | |
| 2638 self.assertEqual('/instances/%s/file' % k, o['Dicom'][0]) | |
| 2639 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][2]) | |
| 2640 self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1]) | |
| 2641 self.assertEqual('/instances/%s/frames/0' % k, o['Slices'][0]) | |
| 2642 | |
| 68 | 2643 self.assertEqual(3, len(o['SlicesShort'])) |
| 2644 self.assertEqual(k, o['SlicesShort'][0][0]) | |
| 2645 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 2646 self.assertEqual(1, o['SlicesShort'][0][2]) | |
| 2647 self.assertEqual(j, o['SlicesShort'][1][0]) | |
| 2648 self.assertEqual(0, o['SlicesShort'][1][1]) | |
| 2649 self.assertEqual(1, o['SlicesShort'][1][2]) | |
| 2650 self.assertEqual(i, o['SlicesShort'][2][0]) | |
| 2651 self.assertEqual(0, o['SlicesShort'][2][1]) | |
| 2652 self.assertEqual(1, o['SlicesShort'][2][2]) | |
| 2653 | |
| 53 | 2654 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID'] |
| 2655 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm')['ID'] | |
| 2656 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] | |
| 2657 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) | |
| 2658 | |
| 2659 self.assertEqual('Sequence', o['Type']) | |
| 2660 self.assertEqual(2, len(o['Dicom'])) | |
| 2661 self.assertEqual(2, len(o['Slices'])) | |
| 2662 self.assertEqual('/instances/%s/file' % i, o['Dicom'][0]) | |
| 2663 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1]) | |
| 2664 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][0]) | |
| 2665 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
|
2666 |
| 68 | 2667 self.assertEqual(2, len(o['SlicesShort'])) |
| 2668 self.assertEqual(i, o['SlicesShort'][0][0]) | |
| 2669 self.assertEqual(0, o['SlicesShort'][0][1]) | |
| 2670 self.assertEqual(1, o['SlicesShort'][0][2]) | |
| 2671 self.assertEqual(j, o['SlicesShort'][1][0]) | |
| 2672 self.assertEqual(0, o['SlicesShort'][1][1]) | |
| 2673 self.assertEqual(1, o['SlicesShort'][1][2]) | |
| 2674 | |
| 2675 | |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2676 |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2677 def test_incoming_movescu_accession(self): |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2678 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2679 |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
2680 # No matching patient, so no job is created |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2681 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2682 CallMoveScu([ '--study', '-k', '0008,0052=STUDY', '-k', 'AccessionNumber=nope' ]) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2683 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2684 CallMoveScu([ '--study', '-k', '0008,0052=PATIENT', '-k', 'AccessionNumber=A10003245599' ]) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2685 self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
2686 |
|
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
2687 # 1 Matching patient, track the job |
| 138 | 2688 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([ |
| 2689 '--study', | |
| 2690 '-k', '0008,0052=STUDY', | |
| 2691 '-k', 'AccessionNumber=A10003245599' | |
| 2692 ]))) | |
|
137
412d5f70447e
testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
2693 |
|
54
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2694 self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) |
|
c5f8a6b0d85e
test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
53
diff
changeset
|
2695 |
| 55 | 2696 |
| 2697 def test_dicom_to_json(self): | |
| 2698 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
|
2699 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
|
2700 |
|
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
2701 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
|
2702 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
|
2703 self.assertTrue(CompareTags(t, json.loads(f.read()), [ |
| 123 | 2704 # Tags for compatibility with DCMTK 3.6.0 |
| 2705 'RETIRED_OtherPatientIDs', | |
| 2706 'OtherPatientIDs', | |
| 2707 'ACR_NEMA_2C_VariablePixelDataGroupLength', | |
|
80
8466dbfcb22b
fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
79
diff
changeset
|
2708 ])) |
| 55 | 2709 |
| 2710 t = DoGet(_REMOTE, '/instances/%s/tags' % i) | |
| 2711 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
|
2712 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
|
2713 ])) |
| 55 | 2714 |
|
60
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
2715 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
|
2716 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
|
2717 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
|
2718 ])) |
|
60
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
2719 |
|
cd3c7f70f139
test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
59
diff
changeset
|
2720 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
|
2721 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
|
2722 a = json.loads(f.read()) |
|
65
09fc27e0899a
patch for testing windows builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
64
diff
changeset
|
2723 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
|
2724 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
|
2725 self.assertEqual(aa, tt) |
| 57 | 2726 |
| 2727 | |
| 2728 def test_batch_archive(self): | |
| 2729 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | |
| 2730 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') | |
| 2731 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 2732 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0002.dcm') | |
| 2733 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 2734 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm') | |
| 2735 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 2736 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm') | |
| 2737 | |
| 2738 s = DoPost(_REMOTE, '/tools/create-archive', [ ]) | |
| 2739 z = zipfile.ZipFile(StringIO(s), "r") | |
| 2740 self.assertEqual(0, len(z.namelist())) | |
| 2741 | |
| 2742 # One patient | |
| 2743 s = DoPost(_REMOTE, '/tools/create-archive', [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ]) | |
| 2744 z = zipfile.ZipFile(StringIO(s), "r") | |
| 2745 self.assertEqual(4, len(z.namelist())) | |
| 2746 | |
| 2747 # One patient + twice its study + one series from other patient | |
| 2748 s = DoPost(_REMOTE, '/tools/create-archive', [ | |
| 2749 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17', | |
| 2750 '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918', | |
| 2751 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' | |
| 2752 ]) | |
| 2753 z = zipfile.ZipFile(StringIO(s), "r") | |
| 2754 self.assertEqual(6, len(z.namelist())) | |
| 2755 | |
| 2756 # One patient + one series + one instance | |
| 2757 s = DoPost(_REMOTE, '/tools/create-archive', [ | |
| 2758 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17', | |
| 2759 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0', | |
| 2760 '1d429ccb-bdcc78a1-7d129d6a-ba4966ed-fe4dbd87' | |
| 2761 ]) | |
| 2762 z = zipfile.ZipFile(StringIO(s), "r") | |
| 2763 self.assertEqual(7, len(z.namelist())) | |
|
59
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2764 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2765 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2766 def test_decode_brainix_as_jpeg(self): |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2767 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
|
2768 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2769 j = GetImage(_REMOTE, '/instances/%s/preview' % i) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2770 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2771 self.assertEqual(j.size[0], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2772 self.assertEqual(j.size[1], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2773 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2774 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
|
2775 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2776 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2777 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
|
2778 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2779 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2780 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
|
2781 self.assertEqual('PNG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2782 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2783 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
|
2784 self.assertEqual('JPEG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2785 self.assertEqual(j.size[0], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2786 self.assertEqual(j.size[1], 256) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2787 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2788 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
|
2789 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
|
2790 self.assertLess(a, b) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2791 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2792 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
|
2793 self.assertEqual('JPEG', j.format) |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2794 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2795 # 16bit encoding is not supported with JPEG |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2796 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
|
2797 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
|
2798 |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2799 # No matching content type |
|
84378ada15ab
test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
58
diff
changeset
|
2800 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
|
2801 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2802 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2803 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2804 def test_media_encodings(self): |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2805 ascii = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2806 latin1 = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2807 latin2 = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID'] |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2808 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2809 tmp = DoPost(_REMOTE, '/tools/create-media', [ascii,latin1,latin2]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2810 z = zipfile.ZipFile(StringIO(tmp), "r") |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2811 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2812 self.assertEqual(4, len(z.namelist())) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2813 self.assertTrue('IMAGES/IM0' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2814 self.assertTrue('IMAGES/IM1' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2815 self.assertTrue('IMAGES/IM2' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2816 self.assertTrue('DICOMDIR' in z.namelist()) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2817 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2818 try: |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2819 os.remove('/tmp/DICOMDIR') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2820 except: |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2821 # The file does not exist |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2822 pass |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2823 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2824 z.extract('DICOMDIR', '/tmp') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2825 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ], |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2826 stderr = subprocess.STDOUT).split('\n') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2827 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2828 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ], |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2829 stderr = subprocess.STDOUT).split('\n') |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2830 self.assertEqual(1, len(a)) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2831 self.assertEqual('', a[0]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2832 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2833 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ]) |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2834 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
|
2835 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
|
2836 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
|
2837 |
|
83fd88230097
test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
68
diff
changeset
|
2838 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
|
2839 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2840 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2841 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
|
2842 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
|
2843 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
|
2844 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
|
2845 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2846 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
|
2847 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
|
2848 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
|
2849 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
|
2850 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2851 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
|
2852 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
|
2853 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
|
2854 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
|
2855 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2856 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
|
2857 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
|
2858 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
|
2859 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
|
2860 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2861 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
|
2862 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
|
2863 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
|
2864 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
|
2865 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2866 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
|
2867 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
|
2868 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
|
2869 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
|
2870 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2871 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
|
2872 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
|
2873 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
|
2874 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
|
2875 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
|
2876 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2877 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
|
2878 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
|
2879 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
|
2880 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
|
2881 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
|
2882 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
|
2883 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2884 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
|
2885 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
|
2886 self.assertEqual(1, len(s)) |
|
176
48cc188ffb09
strip trailing 0 char that appears with some findscu versions
am@osimis.io
parents:
175
diff
changeset
|
2887 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
|
2888 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
|
2889 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
|
2890 |
|
48740070cbf1
TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
70
diff
changeset
|
2891 |
|
78
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
2892 def test_decode_transfer_syntax(self): |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
2893 def Check(t, md5): |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
2894 i = UploadInstance(_REMOTE, 'TransferSyntaxes/%s.dcm' % t)['ID'] |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
2895 |
|
89
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
2896 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
|
2897 transferSyntax = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i) |
|
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
2898 self.assertEqual(t, transferSyntax) |
|
74b7b9aed5f8
test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
2899 |
|
78
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
2900 if md5 == None: |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
2901 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
|
2902 else: |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
2903 m = ComputeMD5(DoGet(_REMOTE, '/instances/%s/preview' % i)) |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
2904 self.assertEqual(m, md5) |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
2905 |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
2906 Check('1.2.840.10008.1.2.1', 'fae08d5415c4c0cd2cdbae4522408631') |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
2907 Check('1.2.840.10008.1.2.2', 'f3d9784768b8feb54d6a50b6d5c37682') |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
2908 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
|
2909 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
|
2910 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
|
2911 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
|
2912 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
|
2913 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
|
2914 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
|
2915 Check('1.2.840.10008.1.2', 'd54aed9f67a100984b42942cc2e9939b') |
|
b89af51797ff
test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
2916 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
|
2917 Check('1.2.840.10008.1.2.4.91', None) # JPEG-2000 image, not supported |
| 79 | 2918 |
| 2919 | |
| 2920 def test_raw_frame(self): | |
| 2921 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] | |
| 2922 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 2923 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 2924 self.assertEqual(512 * 512 * 2, len(a)) | |
| 2925 self.assertEqual(512 * 512 * 2, len(DoGet(_REMOTE, '/instances/%s/frames/23/raw' % s))) | |
| 2926 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/raw' % s)) | |
| 2927 self.assertEqual('1914287dc4d958eca21fdaacfb3482fa', ComputeMD5(a)) | |
| 2928 | |
| 2929 s = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID'] | |
| 2930 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 2931 self.assertEqual(186274, len(DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s))) | |
| 2932 self.assertEqual(189424, len(DoGet(_REMOTE, '/instances/%s/frames/75/raw' % s))) | |
| 2933 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/76/raw' % s)) | |
| 2934 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 2935 self.assertEqual("L", im.mode) | |
| 2936 self.assertEqual(512, im.size[0]) | |
| 2937 self.assertEqual(512, im.size[1]) | |
| 2938 | |
| 2939 # Test an image with 2 JPEG frames spread over multiple fragments | |
| 2940 s = UploadInstance(_REMOTE, 'LenaTwiceWithFragments.dcm')['ID'] | |
| 2941 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) | |
| 2942 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 2943 b = DoGet(_REMOTE, '/instances/%s/frames/1/raw' % s) | |
| 2944 self.assertEqual(69214, len(a)) | |
| 2945 self.assertEqual(ComputeMD5(a), ComputeMD5(b)) | |
| 2946 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/2/raw' % s)) | |
| 2947 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s) | |
| 2948 self.assertEqual("RGB", im.mode) | |
| 2949 self.assertEqual(512, im.size[0]) | |
| 2950 self.assertEqual(512, im.size[1]) | |
| 2951 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % s) | |
| 2952 self.assertEqual("RGB", im.mode) | |
| 2953 self.assertEqual(512, im.size[0]) | |
| 2954 self.assertEqual(512, im.size[1]) | |
| 81 | 2955 |
| 2956 | |
| 2957 | |
| 2958 def test_rest_movescu(self): | |
| 2959 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 2960 | |
| 2961 # Upload 4 instances | |
| 2962 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') | |
| 2963 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm') | |
| 2964 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm') | |
| 2965 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') | |
| 2966 | |
| 2967 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 2968 for p in DoGet(_REMOTE, '/patients'): | |
| 2969 DoPost(_REMOTE, '/modalities/orthanctest/store', p) | |
| 2970 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 2971 | |
| 2972 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 2973 | |
| 2974 # Upload instance Brainix/Flair/IM-0001-0001.dcm | |
| 2975 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Instance', | |
| 2976 'Resources' : [ | |
| 2977 { | |
| 2978 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775', | |
| 2979 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', | |
| 2980 'SOPInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549', | |
| 2981 } | |
| 2982 ]}) | |
| 2983 | |
| 2984 # Upload series Brainix/Flair/* | |
| 2985 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 2986 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 2987 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 2988 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) | |
| 2989 | |
| 2990 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series', | |
| 2991 'Resources' : [ | |
| 2992 { | |
| 2993 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775', | |
| 2994 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', | |
| 2995 } | |
| 2996 ]}) | |
| 2997 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 2998 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 2999 self.assertEqual(1, len(DoGet(_REMOTE, '/series'))) | |
| 3000 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) | |
| 3001 | |
| 3002 # Upload series Brainix/Epi/* | |
| 3003 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series', | |
| 3004 'Resources' : [ | |
| 3005 { | |
| 3006 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775', | |
| 3007 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314125550', | |
| 3008 } | |
| 3009 ]}) | |
| 3010 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) | |
| 3011 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) | |
| 3012 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) | |
| 3013 self.assertEqual(3, len(DoGet(_REMOTE, '/instances'))) | |
| 3014 | |
| 3015 # Upload study Knee/* | |
| 3016 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Study', | |
| 3017 'Resources' : [ | |
| 3018 { | |
| 3019 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881', | |
| 3020 } | |
| 3021 ]}) | |
| 3022 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 3023 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) | |
| 3024 self.assertEqual(3, len(DoGet(_REMOTE, '/series'))) | |
| 3025 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) | |
| 3026 | |
| 3027 # Reset | |
| 3028 for p in DoGet(_REMOTE, '/patients'): | |
| 3029 DoDelete(_REMOTE, '/patients/%s' % p) | |
| 3030 | |
| 3031 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) | |
| 3032 | |
| 3033 | |
| 3034 # Upload all at once | |
| 3035 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Study', | |
| 3036 'Resources' : [ | |
| 3037 { | |
| 3038 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881', | |
| 3039 }, | |
| 3040 { | |
| 3041 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775', | |
| 3042 } | |
| 3043 ]}) | |
| 3044 self.assertEqual(2, len(DoGet(_REMOTE, '/patients'))) | |
| 3045 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) | |
| 3046 self.assertEqual(3, len(DoGet(_REMOTE, '/series'))) | |
| 3047 self.assertEqual(4, len(DoGet(_REMOTE, '/instances'))) | |
| 3048 | |
|
86
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3049 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3050 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3051 def test_reconstruct_json(self): |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3052 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3053 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3054 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3055 first = DoGet(_REMOTE, '/instances/%s/tags' % instance) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3056 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3057 self.assertEqual('TWINOW', first['0008,1010']['Value']) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3058 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance))) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3059 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3060 # Cannot delete the "DICOM" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3061 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
|
3062 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3063 # Can delete the "DICOM as JSON" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3064 r = DoDelete(_REMOTE, '/instances/%s/attachments/dicom-as-json' % instance) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3065 self.assertTrue(type(r) is dict and len(r) == 0) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3066 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3067 # Only the "DICOM" attachment subsists |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3068 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance))) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3069 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3070 # Cannot manually reconstruct the "DICOM as JSON" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3071 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
|
3072 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3073 # Transparently reconstruct the "DICOM as JSON" attachment |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3074 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
|
3075 second = DoGet(_REMOTE, '/instances/%s/tags' % instance) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3076 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance))) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3077 |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3078 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
|
3079 self.assertEqual(str(first), str(second)) |
|
0401ef51f5c1
test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
83
diff
changeset
|
3080 self.assertEqual(str(first), str(third)) |
|
87
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3081 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3082 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3083 def test_reconstruct_json2(self): |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3084 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3085 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3086 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
|
3087 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
|
3088 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3089 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
|
3090 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
|
3091 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3092 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
|
3093 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
|
3094 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3095 DoPost(_REMOTE, '/tools/invalidate-tags', '', 'text/plain') |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3096 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3097 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
|
3098 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
|
3099 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3100 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
|
3101 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
|
3102 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3103 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
|
3104 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
|
3105 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3106 |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3107 def test_private_tags(self): |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3108 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID'] |
|
4b24faec842b
test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
3109 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
|
3110 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
|
3111 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
|
3112 |
|
92
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3113 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3114 def test_findscu_encoding(self): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3115 # Check out ../Database/Encodings/Generate.sh |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3116 TEST = u'Test-éüäöòДΘĝדصķћ๛ﾈİ' |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3117 ENCODINGS = { |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3118 'Arabic' : [ 'ISO_IR 127' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3119 'Ascii' : [ 'ISO_IR 6' ], # More accurately, ISO 646 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3120 'Cyrillic' : [ 'ISO_IR 144' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3121 'Greek' : [ 'ISO_IR 126' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3122 'Hebrew' : [ 'ISO_IR 138' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3123 'Japanese' : [ 'ISO_IR 13', 'shift-jis' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3124 'Latin1' : [ 'ISO_IR 100' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3125 'Latin2' : [ 'ISO_IR 101' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3126 'Latin3' : [ 'ISO_IR 109' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3127 'Latin4' : [ 'ISO_IR 110' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3128 'Latin5' : [ 'ISO_IR 148' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3129 'Thai' : [ 'ISO_IR 166', 'tis-620' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3130 'Utf8' : [ 'ISO_IR 192' ], |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3131 } |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3132 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3133 for name in ENCODINGS.iterkeys(): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3134 if len(ENCODINGS[name]) == 1: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3135 ENCODINGS[name].append(name.lower()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3136 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3137 UploadInstance(_REMOTE, 'Encodings/Lena-utf8.dcm') |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3138 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3139 for name in ENCODINGS.iterkeys(): |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3140 self.assertEqual(name, DoPut(_REMOTE, '/tools/default-encoding', name)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3141 self.assertEqual(name, DoGet(_REMOTE, '/tools/default-encoding')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3142 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3143 i = CallFindScu([ '-k', '0008,0052=STUDY', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3144 '-k', 'SpecificCharacterSet', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3145 '-k', 'PatientName' ]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3146 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3147 characterSet = re.findall('\(0008,0005\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3148 self.assertEqual(1, len(characterSet)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3149 self.assertEqual(ENCODINGS[name][0], characterSet[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3150 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3151 patientName = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3152 self.assertEqual(1, len(patientName)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3153 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3154 expected = TEST.encode(ENCODINGS[name][1], 'ignore') |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3155 self.assertEqual(expected, patientName[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3156 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3157 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3158 #for master in ENCODINGS: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3159 for master in [ 'Latin1', 'Utf8', 'Cyrillic' ]: # Shortcut to speedup tests |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3160 self.assertEqual(master, DoPut(_REMOTE, '/tools/default-encoding', master)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3161 self.assertEqual(master, DoGet(_REMOTE, '/tools/default-encoding')) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3162 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3163 for name in ENCODINGS: |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3164 DropOrthanc(_REMOTE) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3165 UploadInstance(_REMOTE, 'Encodings/Lena-%s.dcm' % ENCODINGS[name][1]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3166 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3167 i = CallFindScu([ '-k', '0008,0052=STUDY', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3168 '-k', 'PatientID', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3169 '-k', 'SpecificCharacterSet', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3170 '-k', 'PatientName' ]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3171 i = i.decode(ENCODINGS[master][1]) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3172 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3173 characterSet = re.findall('\(0008,0005\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3174 self.assertEqual(1, len(characterSet)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3175 self.assertEqual(ENCODINGS[master][0], characterSet[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3176 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3177 patientId = re.findall('\(0010,0020\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3178 self.assertEqual(1, len(patientId)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3179 self.assertEqual(ENCODINGS[name][1], patientId[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3180 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3181 patientName = re.findall('\(0010,0010\).*?\[(.*?)\]', i) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3182 self.assertEqual(1, len(patientName)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3183 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3184 tmp = ENCODINGS[name][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3185 expected = TEST.encode(tmp, 'ignore').decode(tmp) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3186 tmp = ENCODINGS[master][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3187 expected = expected.encode(tmp, 'ignore').decode(tmp) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3188 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3189 self.assertEqual(expected, patientName[0].strip()) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3190 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3191 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3192 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True, |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3193 'Level' : 'Study', |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3194 'Query' : { }}) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3195 self.assertEqual(1, len(a)) |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3196 |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3197 tmp = ENCODINGS[name][1] |
|
dbcbffb889da
test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
3198 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
|
3199 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3200 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3201 def test_reconstruct(self): |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3202 def CompareMainDicomTag(expected, instance, level, tag): |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3203 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
|
3204 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3205 a = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3206 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3207 studies = DoGet(_REMOTE, '/studies/') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3208 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3209 self.assertEqual(1, len(studies)) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3210 self.assertEqual(1, len(DoGet(_REMOTE, '/series/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3211 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3212 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3213 modified = DoPost(_REMOTE, '/studies/%s/modify' % studies[0], { |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3214 "Replace" : { |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3215 "StudyDescription" : "hello", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3216 "SeriesDescription" : "world", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3217 "SOPClassUID" : "test", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3218 "SOPInstanceUID" : "myid", |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3219 }, |
| 119 | 3220 "Keep" : [ "StudyInstanceUID", "SeriesInstanceUID" ], |
| 3221 "Force" : True | |
|
96
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3222 }) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3223 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3224 instances = DoGet(_REMOTE, '/instances/') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3225 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3226 self.assertEqual(1, len(DoGet(_REMOTE, '/studies/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3227 self.assertEqual(1, len(DoGet(_REMOTE, '/series/'))) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3228 self.assertEqual(2, len(instances)) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3229 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3230 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
|
3231 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3232 CompareMainDicomTag('Knee (R)', a, 'study', 'StudyDescription') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3233 CompareMainDicomTag('AX. FSE PD', a, 'series', 'SeriesDescription') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3234 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
|
3235 CompareMainDicomTag('myid', b, '', 'SOPInstanceUID') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3236 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
|
3237 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
|
3238 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3239 DoPost(_REMOTE, '/instances/%s/reconstruct' % b, {}) |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3240 |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3241 CompareMainDicomTag('hello', a, 'study', 'StudyDescription') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3242 CompareMainDicomTag('world', a, 'series', 'SeriesDescription') |
|
272d1229cb49
test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
3243 CompareMainDicomTag('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a, '', 'SOPInstanceUID') |
| 102 | 3244 |
| 104 | 3245 def test_httpClient_lua(self): |
| 3246 with open(GetDatabasePath('Lua/HttpClient.lua'), 'r') as f: | |
| 102 | 3247 result = DoPost(_REMOTE, '/tools/execute-script', f.read(), 'application/lua') |
| 3248 | |
| 3249 self.assertIn('OK', result) | |
|
107
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3250 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3251 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3252 def test_bitbucket_issue_44(self): |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3253 # 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
|
3254 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3255 UploadInstance(_REMOTE, 'Issue44/Monochrome2.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3256 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3257 # dcmcjpeg +ua +eb Monochrome1.dcm Monochrome1-Jpeg.dcm |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3258 UploadInstance(_REMOTE, 'Issue44/Monochrome1-Jpeg.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3259 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3260 # dcmcjpeg +ua Monochrome1.dcm Monochrome1-JpegLS.dcm |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3261 UploadInstance(_REMOTE, 'Issue44/Monochrome1-JpegLS.dcm') |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3262 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3263 monochrome1 = 'bcdd600a-a6a9c522-5f0a6e84-8657c9f3-b76e59b7' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3264 monochrome1_jpeg = '9df82121-208a2da8-0038674a-3d7a773b-b7008cd2' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3265 monochrome1_jpegls = '0486d1a2-9165573f-b1976b20-e927b016-6b8d67ab' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3266 monochrome2 = 'f00947b7-f61f7164-c93414d1-c6fbda6a-9e92ed20' |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3267 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3268 for i in [ monochrome1, monochrome1_jpeg, monochrome1_jpegls ]: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3269 im = GetImage(_REMOTE, '/instances/%s/preview' % i) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3270 self.assertEqual("L", im.mode) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3271 self.assertEqual(2010, im.size[0]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3272 self.assertEqual(2446, im.size[1]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3273 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3274 # 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
|
3275 # white (255), should be rendered as black (0) => invert |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3276 if i == monochrome1_jpeg: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3277 # Add some tolerance because of JPEG destructive compression |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3278 self.assertGreater(10, im.getpixel((0,0))) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3279 else: |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3280 self.assertEqual(0, im.getpixel((0,0))) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3281 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3282 im = GetImage(_REMOTE, '/instances/%s/preview' % monochrome2) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3283 self.assertEqual("L", im.mode) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3284 self.assertEqual(1572, im.size[0]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3285 self.assertEqual(2010, im.size[1]) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3286 |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3287 # 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
|
3288 # white (255), should be rendered as white (255) |
|
fddb35f7289d
test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
104
diff
changeset
|
3289 self.assertEqual(255, im.getpixel((0,0))) |
|
111
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3290 |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3291 |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3292 def test_bitbucket_issue_42(self): |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3293 # https://bitbucket.org/sjodogne/orthanc/issues/42/fails-to-modify-a-dicom-video-file |
| 123 | 3294 # 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
|
3295 UploadInstance(_REMOTE, 'Issue42.dcm')['ID'] |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3296 modified = DoPost(_REMOTE, |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3297 '/patients/da128605-e040d0c4-310615d2-3475da63-df2d1ef4/modify', |
| 119 | 3298 '{"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
|
3299 'application/json') |
|
7005cdeeb704
test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
3300 self.assertTrue('PatientID' in modified) |
|
113
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3301 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3302 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3303 def test_rest_find_limit(self): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3304 # 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
|
3305 # 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
|
3306 |
|
113
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3307 # Upload 6 instances |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3308 brainix = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3309 knee = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3310 for i in range(2): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3311 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
|
3312 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
|
3313 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
|
3314 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3315 # Check using BRAINIX |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3316 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3317 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3318 'Limit' : 10 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3319 self.assertEqual(4, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3320 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3321 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3322 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3323 'Limit' : 4 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3324 self.assertEqual(4, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3325 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3326 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3327 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3328 'Since' : 2, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3329 'Limit' : 4 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3330 self.assertEqual(2, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3331 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3332 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3333 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3334 'Limit' : 3 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3335 self.assertEqual(3, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3336 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3337 b = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3338 for i in range(4): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3339 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3340 'Query' : { 'PatientName' : 'B*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3341 'Limit' : 1, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3342 'Since' : i }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3343 self.assertEqual(1, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3344 b.append(a[0]) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3345 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3346 # 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
|
3347 self.assertEqual(0, len(set(b) ^ set(brainix))) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3348 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3349 # Check using KNEE |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3350 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3351 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3352 'Limit' : 10 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3353 self.assertEqual(2, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3354 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3355 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3356 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3357 'Limit' : 2 }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3358 self.assertEqual(2, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3359 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3360 b = [] |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3361 for i in range(2): |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3362 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3363 'Query' : { 'PatientName' : 'K*' }, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3364 'Limit' : 1, |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3365 'Since' : i }) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3366 self.assertEqual(1, len(a)) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3367 b.append(a[0]) |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3368 |
|
3e5934363e76
test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
112
diff
changeset
|
3369 self.assertEqual(0, len(set(b) ^ set(knee))) |
|
115
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3370 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3371 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3372 def test_bitbucket_issue_46(self): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3373 # "PHI remaining after anonymization" |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3374 # https://bitbucket.org/sjodogne/orthanc/issues/46 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3375 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3376 def GetAnonymizedTags(study, version): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3377 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3378 { 'DicomVersion' : version }, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3379 'application/json') ['ID'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3380 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3381 self.assertEqual(1, len(a)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3382 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3383 instance = a[0]['ID'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3384 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3385 return (instance, DoGet(_REMOTE, '/instances/%s/tags' % instance)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3386 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3387 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm') |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3388 origStudy = '6068a14b-d4df27af-9ec22145-538772d8-74f228ff' |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3389 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3390 # 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
|
3391 # (Patient's Mother's Birth Name) tags |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3392 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy, |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3393 '{"Replace":{"0010,1060":"OSIMIS","0032,1033":"MOTHER"}}', |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3394 'application/json')['ID'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3395 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3396 # 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
|
3397 # 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
|
3398 (instance, tags) = GetAnonymizedTags(newStudy, "2008") |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3399 self.assertTrue('0032,1033' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3400 self.assertTrue('0010,1060' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3401 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3402 # 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
|
3403 # 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
|
3404 (instance, tags) = GetAnonymizedTags(newStudy, "2017c") |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3405 self.assertFalse('0032,1033' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3406 self.assertFalse('0010,1060' in tags) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3407 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3408 t = {} |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3409 for (key, value) in tags.iteritems(): |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3410 t[value['Name']] = value['Value'] |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3411 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3412 self.assertEqual('', t['StudyDate']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3413 self.assertEqual('', t['StudyTime']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3414 self.assertEqual('', t['PatientSex']) # Type 1 tag => cleared |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3415 self.assertFalse('SeriesDate' in t) # Type 3 tag => null |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3416 self.assertFalse('SeriesTime' in t) # Type 3 tag => null |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3417 |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3418 with tempfile.NamedTemporaryFile(delete = True) as f: |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3419 # 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
|
3420 f.write(DoGet(_REMOTE, '/instances/%s/file' % instance)) |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3421 f.flush() |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3422 subprocess.check_output([ FindExecutable('dciodvfy'), f.name ], |
|
45ebfab035b7
test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
113
diff
changeset
|
3423 stderr = subprocess.STDOUT).split('\n') |
|
118
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3424 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3425 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3426 def test_bitbucket_issue_55(self): |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3427 def Run(modify, query): |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3428 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3429 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3430 operation = 'modify' if modify else 'anonymize' |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3431 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3432 self.assertRaises(Exception, lambda: DoPost( |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3433 _REMOTE, '/studies/%s/%s' % (study, operation), query)) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3434 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3435 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3436 query["Force"] = True |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3437 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
|
3438 self.assertEqual(2, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3439 DoDelete(_REMOTE, a) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3440 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3441 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3442 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3443 UploadInstance(_REMOTE, 'DummyCT.dcm') |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3444 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3445 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3446 Run(True, { "Replace" : { "StudyInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3447 Run(True, { "Replace" : { "SeriesInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3448 Run(True, { "Replace" : { "SOPInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3449 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3450 Run(False, { "Keep" : [ "StudyInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3451 Run(False, { "Keep" : [ "SeriesInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3452 Run(False, { "Keep" : [ "SOPInstanceUID" ]}) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3453 |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3454 Run(False, { "Replace" : { "StudyInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3455 Run(False, { "Replace" : { "SeriesInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3456 Run(False, { "Replace" : { "SOPInstanceUID" : "world" } }) |
|
a954c535fef6
test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
117
diff
changeset
|
3457 |
|
120
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3458 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3459 def test_bitbucket_issue_56(self): |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3460 # Case-insensitive matching over accents. This test assumes |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3461 # that the "CaseSensitivePN" configuration option of Orthanc |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3462 # is set to "false" (default value). |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3463 # https://bitbucket.org/sjodogne/orthanc/issues/56 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3464 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3465 def Check(name, expected, expectedSensitive): |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3466 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
|
3467 '-k', '0008,0052=PATIENT', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3468 '-k', 'PatientName=%s' % name ]) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3469 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', a) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3470 self.assertEqual(expected, len(patientNames)) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3471 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3472 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3473 'CaseSensitive' : False, |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3474 'Query' : { 'PatientName' : name }}) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3475 self.assertEqual(expected, len(a)) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3476 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3477 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3478 'CaseSensitive' : True, |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3479 'Query' : { 'PatientName' : name }}) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3480 self.assertEqual(expectedSensitive, len(a)) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3481 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3482 UploadInstance(_REMOTE, 'Encodings/Lena-latin1.dcm') |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3483 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3484 # WildcardConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3485 Check('TeSt*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3486 Check('TeSt-a*', 0, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3487 Check('TeSt-É*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3488 Check('TeSt-é*', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3489 Check('Test-é*', 1, 1) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3490 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3491 # ListConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3492 Check('Test-éüäöò\\nope', 1, 1) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3493 Check('Test-ÉÜÄÖÒ\\nope', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3494 |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3495 # ValueConstraint |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3496 Check('Test-éüäöò', 1, 1) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3497 Check('Test-ÉÜÄÖÒ', 1, 0) |
|
fce08afe6b2d
test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
119
diff
changeset
|
3498 |
| 125 | 3499 |
| 3500 def test_gbk_alias(self): | |
| 3501 # https://groups.google.com/d/msg/orthanc-users/WMM8LMbjpUc/02-1f_yFCgAJ | |
| 3502 # This test fails on Orthanc <= 1.3.0 | |
| 3503 i = UploadInstance(_REMOTE, '2017-09-19-GBK-Tumashu.dcm')['ID'] | |
| 3504 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) | |
| 3505 self.assertEqual(tags['PatientName'], u'徐浩凯') | |
| 3506 self.assertEqual(tags['InstitutionName'], u'灌云县疾病预防控制中心') | |
| 126 | 3507 |
| 3508 | |
| 3509 def test_long_tag(self): | |
| 3510 i = UploadInstance(_REMOTE, 'DummyCTWithLongTag.dcm')['ID'] | |
| 3511 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' | |
| 3512 | |
| 3513 tags = DoGet(_REMOTE, '/instances/%s/tags' % i) | |
| 3514 self.assertTrue('0018,1020' in tags) | |
| 3515 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name']) | |
| 3516 self.assertEqual('TooLong', tags['0018,1020']['Type']) | |
| 3517 self.assertEqual(None, tags['0018,1020']['Value']) | |
| 3518 | |
| 3519 tags = DoGet(_REMOTE, '/instances/%s/tags?ignore-length=0018-1020' % i) | |
| 3520 self.assertTrue('0018,1020' in tags) | |
| 3521 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name']) | |
| 3522 self.assertEqual('String', tags['0018,1020']['Type']) | |
| 3523 self.assertTrue(tags['0018,1020']['Value'].startswith('Lorem ipsum dolor sit amet')) | |
| 3524 | |
| 3525 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i) | |
| 3526 self.assertTrue('SoftwareVersions' in tags) | |
| 3527 self.assertEqual(None, tags['SoftwareVersions']) | |
| 3528 self.assertTrue('HeartRate' in tags) | |
| 3529 self.assertEqual(474, int(tags['HeartRate'])) | |
| 3530 | |
| 3531 tags = DoGet(_REMOTE, '/instances/%s/simplified-tags' % i) | |
| 3532 self.assertTrue('SoftwareVersions' in tags) | |
| 3533 self.assertEqual(None, tags['SoftwareVersions']) | |
| 3534 | |
| 3535 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify&ignore-length=0018-1020' % i) | |
| 3536 self.assertTrue('SoftwareVersions' in tags) | |
| 3537 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet')) | |
| 3538 | |
| 3539 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify&ignore-length=SoftwareVersions' % i) | |
| 3540 self.assertTrue('SoftwareVersions' in tags) | |
| 3541 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet')) | |
| 3542 | |
| 3543 tags = DoGet(_REMOTE, '/series/%s/instances-tags' % series) | |
| 3544 self.assertEqual(1, len(tags)) | |
| 3545 self.assertTrue(i in tags.keys()) | |
| 3546 self.assertTrue('0018,1020' in tags[i]) | |
| 3547 self.assertEqual('TooLong', tags[i]['0018,1020']['Type']) | |
| 3548 | |
| 3549 tags = DoGet(_REMOTE, '/series/%s/instances-tags?ignore-length=SoftwareVersions' % series) | |
| 3550 self.assertEqual(1, len(tags)) | |
| 3551 self.assertTrue(i in tags.keys()) | |
| 3552 self.assertTrue('0018,1020' in tags[i]) | |
| 3553 self.assertEqual('String', tags[i]['0018,1020']['Type']) | |
| 3554 self.assertTrue(tags[i]['0018,1020']['Value'].startswith('Lorem ipsum dolor sit amet')) | |
| 3555 | |
|
127
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3556 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3557 def test_extended_media(self): |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3558 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3559 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3560 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
|
3561 self.assertEqual(2, len(z.namelist())) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3562 self.assertTrue('IMAGES/IM0' in z.namelist()) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3563 self.assertTrue('DICOMDIR' in z.namelist()) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3564 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3565 try: |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3566 os.remove('/tmp/DICOMDIR') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3567 except: |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3568 # The file does not exist |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3569 pass |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3570 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3571 z.extract('DICOMDIR', '/tmp') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3572 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ], |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3573 stderr = subprocess.STDOUT).split('\n') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3574 self.assertEqual(5, len(a)) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3575 self.assertTrue(a[0].startswith('Warning')) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3576 self.assertEqual('BasicDirectory', a[1]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3577 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
|
3578 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
|
3579 self.assertEqual('', a[4]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3580 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3581 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ], |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3582 stderr = subprocess.STDOUT).split('\n') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3583 self.assertEqual(1, len(a)) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3584 self.assertEqual('', a[0]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3585 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3586 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ]) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3587 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
|
3588 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3589 # Check the presence of the series description (extended tag) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3590 self.assertTrue(re.search('T1W_aTSE', a) != None) |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3591 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3592 os.remove('/tmp/DICOMDIR') |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3593 |
|
1eea4d3a1ba9
test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
126
diff
changeset
|
3594 |
|
132
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3595 def test_anonymize_relationships_1(self): |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3596 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3597 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
|
3598 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3599 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3600 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3601 '{}', |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3602 'application/json')['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3603 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3604 a = DoGet(_REMOTE, '/studies/%s/instances' % study) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3605 self.assertEqual(2, len(a)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3606 a1 = a[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3607 a2 = a[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3608 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3609 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3610 self.assertEqual(2, len(b)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3611 b1 = b[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3612 b2 = b[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3613 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3614 SEQUENCE = '/instances/%s/content/ReferencedImageSequence' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3615 SOP = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPInstanceUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3616 CLASS = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPClassUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3617 FRAME = '/instances/%s/content/FrameOfReferenceUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3618 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3619 self.assertEqual(DoGet(_REMOTE, FRAME % a1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3620 DoGet(_REMOTE, FRAME % a2)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3621 self.assertEqual(DoGet(_REMOTE, FRAME % b1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3622 DoGet(_REMOTE, FRAME % b2)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3623 self.assertNotEqual(DoGet(_REMOTE, FRAME % a1), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3624 DoGet(_REMOTE, FRAME % b1)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3625 self.assertNotEqual(DoGet(_REMOTE, FRAME % a2), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3626 DoGet(_REMOTE, FRAME % b2)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3627 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3628 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
|
3629 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
|
3630 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
|
3631 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
|
3632 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3633 for i in range(3): |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3634 self.assertEqual(DoGet(_REMOTE, SOP % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3635 DoGet(_REMOTE, SOP % (a2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3636 self.assertEqual(DoGet(_REMOTE, SOP % (b1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3637 DoGet(_REMOTE, SOP % (b2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3638 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3639 DoGet(_REMOTE, SOP % (b1, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3640 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3641 DoGet(_REMOTE, SOP % (b2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3642 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3643 DoGet(_REMOTE, CLASS % (b1, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3644 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, i)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3645 DoGet(_REMOTE, CLASS % (b2, i))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3646 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3647 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3648 def test_anonymize_relationships_2(self): |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3649 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm') |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3650 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
|
3651 study = '6c65289b-db2fcb71-7eaf73f4-8e12470c-a4d6d7cf' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3652 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3653 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3654 '{}', |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3655 'application/json')['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3656 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3657 a = DoGet(_REMOTE, '/studies/%s/instances' % study) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3658 self.assertEqual(2, len(a)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3659 a1 = a[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3660 a2 = a[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3661 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3662 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3663 self.assertEqual(2, len(b)) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3664 b1 = b[0]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3665 b2 = b[1]['ID'] |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3666 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3667 SEQUENCE = '/instances/%s/content/SourceImageSequence' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3668 SOP = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPInstanceUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3669 CLASS = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPClassUID' |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3670 |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3671 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
|
3672 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
|
3673 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
|
3674 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
|
3675 self.assertEqual(DoGet(_REMOTE, SOP % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3676 DoGet(_REMOTE, SOP % (a2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3677 self.assertEqual(DoGet(_REMOTE, SOP % (b1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3678 DoGet(_REMOTE, SOP % (b2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3679 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3680 DoGet(_REMOTE, SOP % (b1, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3681 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3682 DoGet(_REMOTE, SOP % (b2, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3683 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3684 DoGet(_REMOTE, CLASS % (b1, 0))) |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3685 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, 0)), |
|
149144d854bb
Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
130
diff
changeset
|
3686 DoGet(_REMOTE, CLASS % (b2, 0))) |
|
133
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3687 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3688 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3689 def test_anonymize_relationships_3(self): |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3690 sr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM0')['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3691 mr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM631')['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3692 study = 'ef351eb2-c1147229-062736b8-35a151e3-e32d526b' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3693 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3694 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3695 { "Keep" : [ "ContentSequence" ] }) ['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3696 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3697 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3698 self.assertEqual(2, len(a)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3699 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3700 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
|
3701 sr2 = a[0]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3702 mr2 = a[1]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3703 else: |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3704 sr2 = a[1]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3705 mr2 = a[0]['ID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3706 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3707 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % sr1), |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3708 DoGet(_REMOTE, '/instances/%s/content/Modality' % sr2)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3709 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % mr1), |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3710 DoGet(_REMOTE, '/instances/%s/content/Modality' % mr2)) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3711 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3712 mrUid1 = DoGet(_REMOTE, '/instances/%s' % mr1)['MainDicomTags']['SOPInstanceUID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3713 mrUid2 = DoGet(_REMOTE, '/instances/%s' % mr2)['MainDicomTags']['SOPInstanceUID'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3714 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
|
3715 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
|
3716 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
|
3717 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
|
3718 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3719 PATH1 = '/instances/%s/content/CurrentRequestedProcedureEvidenceSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3720 PATH2 = PATH1 + '/0/ReferencedSeriesSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3721 PATH3 = PATH2 + '/0/ReferencedSOPSequence' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3722 PATH4 = PATH3 + '/0/ReferencedSOPInstanceUID' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3723 PATH5 = PATH3 + '/0/ReferencedSOPClassUID' |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3724 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3725 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3726 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3727 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr1))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3728 self.assertEqual(DoGet(_REMOTE, PATH4 % sr1), mrUid1) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3729 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
|
3730 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
|
3731 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3732 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3733 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3734 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr2))) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3735 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
|
3736 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3737 self.assertEqual(mrUid2, DoGet(_REMOTE, PATH4 % sr2).strip('\x00')) |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3738 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
|
3739 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
|
3740 |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3741 content1 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr1) ['ContentSequence'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3742 content2 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr2) ['ContentSequence'] |
|
f0d4c4707e64
test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
132
diff
changeset
|
3743 self.assertEqual(str(content1), str(content2)) |
|
141
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3744 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3745 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3746 def test_bitbucket_issue_94(self): |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3747 # "a simple instance modification should not modify FrameOfReferenceUID + ..." |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3748 # https://bitbucket.org/sjodogne/orthanc/issues/94 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3749 i = UploadInstance(_REMOTE, 'Issue94.dcm')['ID'] |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3750 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3751 source = DoGet(_REMOTE, '/instances/%s/attachments/dicom/data' % i) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3752 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3753 modified = DoPost(_REMOTE, '/instances/%s/modify' % i, |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3754 { "Replace" : {"PatientID" : "toto"}, "Force": True}) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3755 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3756 anonymized = DoPost(_REMOTE, '/instances/%s/anonymize' % i) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3757 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3758 a = ExtractDicomTags(source, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3759 self.assertEqual(1, len(a)) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3760 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3761 b = ExtractDicomTags(modified, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3762 self.assertEqual(1, len(b)) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3763 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3764 c = ExtractDicomTags(anonymized, [ 'FrameOfReferenceUID' ]) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3765 self.assertEqual(1, len(c)) |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3766 |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3767 self.assertEqual(a, b) # Modified DICOM |
|
5de178abe4d8
test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
138
diff
changeset
|
3768 self.assertNotEqual(a, c) # Anonymized DICOM |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3769 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3770 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3771 def test_metadata_origin(self): |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3772 # Upload using the REST API |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3773 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
|
3774 self.assertEqual('RestApi', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3775 self.assertEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3776 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3777 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
|
3778 self.assertEqual('alice', DoGet(_REMOTE, '/instances/%s/metadata/HttpUsername' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3779 |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3780 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3781 self.assertEqual('RestApi', m['Origin']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3782 self.assertEqual('', m['RemoteAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3783 self.assertNotEqual('', m['RemoteIP']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3784 self.assertFalse('CalledAET' in m) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3785 self.assertEqual('alice', m['HttpUsername']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3786 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3787 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
|
3788 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
|
3789 self.assertEqual('1', m['IndexInSeries']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3790 self.assertTrue('ReceptionDate' in m) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3791 |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3792 DoDelete(_REMOTE, '/instances/%s' % i) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3793 |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3794 # Upload using the DICOM protocol |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3795 subprocess.check_call([ FindExecutable('storescu'), |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3796 _REMOTE['Server'], str(_REMOTE['DicomPort']), |
|
144
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3797 GetDatabasePath('Knee/T1/IM-0001-0001.dcm'), |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3798 '-xw' ]) # Propose JPEG2000 |
|
143
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3799 self.assertEqual('DicomProtocol', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3800 self.assertEqual('STORESCU', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3801 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i)) |
|
28d50ffac07d
test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
142
diff
changeset
|
3802 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
|
3803 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
|
3804 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3805 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3806 self.assertEqual('DicomProtocol', m['Origin']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3807 self.assertEqual('STORESCU', m['RemoteAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3808 self.assertNotEqual('', m['RemoteIP']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3809 self.assertEqual('ANY-SCP', m['CalledAET']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3810 self.assertFalse('HttpUsername' in m) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3811 |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3812 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
|
3813 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
|
3814 self.assertEqual('1', m['IndexInSeries']) |
|
7809fdf8056f
testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
143
diff
changeset
|
3815 self.assertTrue('ReceptionDate' in m) |
| 147 | 3816 |
| 3817 | |
| 3818 def test_lua_deadlock(self): | |
| 3819 # Rana Asim Wajid (2018-07-14): "It does seem that the issue | |
| 3820 # is with the lua script I'm using for conversion of images to | |
| 3821 # JPEG2000. When the script is used with 1.4.0 the first | |
| 3822 # instance appears to be stored and then everything just | |
| 3823 # halts, ie Orthanc wont respond to anything after that." | |
| 3824 # https://groups.google.com/d/msg/orthanc-users/Rc-Beb42xc8/JUgdzrmCAgAJ | |
| 174 | 3825 InstallLuaScriptFromPath(_REMOTE, 'Lua/Jpeg2000Conversion.lua') |
| 147 | 3826 |
| 3827 subprocess.check_call([ FindExecutable('storescu'), | |
| 3828 _REMOTE['Server'], str(_REMOTE['DicomPort']), | |
| 3829 GetDatabasePath('Brainix/Flair/IM-0001-0001.dcm'), | |
| 3830 GetDatabasePath('Brainix/Flair/IM-0001-0002.dcm'), | |
| 3831 ]) | |
| 3832 | |
| 3833 instances = DoGet(_REMOTE, '/instances') | |
| 3834 self.assertEqual(2, len(instances)) | |
| 3835 | |
| 3836 t1 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[0]) | |
| 3837 t2 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[1]) | |
| 175 | 3838 self.assertEqual('1.2.840.10008.1.2.4.90', t1) # this will fail if libgdcm-tools is not installed |
| 147 | 3839 self.assertEqual(t1, t2); |
|
154
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
3840 |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
3841 |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
3842 def test_find_group_length(self): |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
3843 # 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
|
3844 # one of the Generic Group Length tags (*, 0x0000) |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
3845 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
|
3846 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
|
3847 self.assertFalse('UnableToProcess' in result) |
|
4a533d003080
test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
147
diff
changeset
|
3848 self.assertFalse('E:' in result) |
|
179
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3849 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3850 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3851 def test_split(self): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3852 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3853 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3854 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3855 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3856 t2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3857 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3858 self.assertEqual(1, len(DoGet(_REMOTE, '/studies'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3859 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3860 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3861 info = DoGet(_REMOTE, '/studies/%s' % study) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3862 self.assertTrue('ReferringPhysicianName' in info['MainDicomTags']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3863 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3864 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3865 (_REMOTE, '/studies/%s/split' % study, { |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3866 'Series' : [ t2 ], |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3867 'Replace' : { 'PatientName' : 'Hello' }, |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3868 'Remove' : [ 'ReferringPhysicianName' ], |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3869 'KeepSource' : False |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3870 })) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3871 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3872 self.assertNotEqual(None, job) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3873 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3874 studies = set(DoGet(_REMOTE, '/studies')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3875 self.assertEqual(2, len(studies)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3876 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3877 series = set(DoGet(_REMOTE, '/series')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3878 self.assertEqual(2, len(series)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3879 self.assertTrue(t1 in series) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3880 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3881 study2 = DoGet(_REMOTE, '/jobs/%s' % job)['Content']['TargetStudy'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3882 self.assertTrue(study in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3883 self.assertTrue(study2 in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3884 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3885 info = DoGet(_REMOTE, '/studies/%s' % study2) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3886 self.assertTrue('Hello', info['PatientMainDicomTags']['PatientName']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3887 self.assertFalse('ReferringPhysicianName' in info['MainDicomTags']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3888 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3889 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3890 def test_merge(self): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3891 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3892 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3893 knee = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3894 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3895 brainix = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3896 flair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0' |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3897 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3898 self.assertEqual(2, len(DoGet(_REMOTE, '/studies'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3899 self.assertEqual(2, len(DoGet(_REMOTE, '/series'))) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3900 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3901 job = MonitorJob2(_REMOTE, lambda: DoPost |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3902 (_REMOTE, '/studies/%s/merge' % knee, { |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3903 'Resources' : [ brainix ], |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3904 'KeepSource' : True |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3905 })) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3906 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3907 self.assertNotEqual(None, job) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3908 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3909 studies = set(DoGet(_REMOTE, '/studies')) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3910 self.assertEqual(2, len(studies)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3911 self.assertTrue(knee in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3912 self.assertTrue(brainix in studies) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3913 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3914 series = set(DoGet(_REMOTE, '/studies/%s' % knee)['Series']) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3915 self.assertTrue(t1 in series) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3916 series.remove(t1) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3917 self.assertEqual(1, len(series)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3918 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3919 instances = DoGet(_REMOTE, '/series/%s' % list(series)[0])['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3920 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3921 merged = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3922 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3923 instances = DoGet(_REMOTE, '/series/%s' % t1)['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3924 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3925 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3926 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3927 instances = DoGet(_REMOTE, '/series/%s' % flair)['Instances'] |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3928 self.assertEqual(1, len(instances)) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3929 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3930 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3931 tags = DoGet(_REMOTE, '/studies/%s' % knee) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3932 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3933 for key in tags['PatientMainDicomTags']: |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3934 self.assertEqual(a[key], merged[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3935 if (key in b and key != 'PatientSex'): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3936 self.assertNotEqual(a[key], b[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3937 |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3938 for key in tags['MainDicomTags']: |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3939 # Not in the patient/study module |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3940 if (not key in [ 'InstitutionName', |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3941 'RequestingPhysician', |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3942 'RequestedProcedureDescription', ]): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3943 self.assertEqual(a[key], merged[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3944 if (key in b): |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3945 self.assertNotEqual(a[key], b[key]) |
|
8a2dd77d4035
testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
177
diff
changeset
|
3946 |