orthanc-tests: Plugins/DicomWeb/Run.py annotate

annotate Plugins/DicomWeb/Run.py @ 363:79ce0f7a9714

upgrade to year 2021

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 06 Jan 2021 17:56:54 +0100
parents	a56cbcbacfde
children	9d2a63afdb73

rev	line source
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 #!/usr/bin/python
224 f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	2 # -- coding: utf-8 --
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	3
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 # Orthanc - A Lightweight, RESTful DICOM Store
73 97acfdf0dbce 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 33 diff changeset	6 # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 # Department, University Hospital of Liege, Belgium
363 79ce0f7a9714 upgrade to year 2021 Sebastien Jodogne <s.jodogne@gmail.com> parents: 346 diff changeset	8 # Copyright (C) 2017-2021 Osimis S.A., Belgium
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 #
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 # This program is free software: you can redistribute it and/or
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 # modify it under the terms of the GNU General Public License as
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 # published by the Free Software Foundation, either version 3 of the
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 # License, or (at your option) any later version.
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 #
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 # This program is distributed in the hope that it will be useful, but
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 # WITHOUT ANY WARRANTY; without even the implied warranty of
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 # General Public License for more details.
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 #
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 # You should have received a copy of the GNU General Public License
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 # along with this program. If not, see <http://www.gnu.org/licenses/>.
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23
85 96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	24
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	25 # You must add the following to the configuration file:
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	26 #
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	27 # "DicomWeb" : {
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	28 # "Servers" : {
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	29 # "sample" : [ "http://localhost:8042/dicom-web/", "alice", "orthanctest" ]
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	30 # }
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	31 # }
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	32
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	33
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	34
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	35 import copy
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 import os
33 eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	37 import pprint
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 import sys
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 import argparse
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40 import unittest
83 3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	41 import re
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	42 from PIL import ImageChops
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	43
33 eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	44 from DicomWeb import *
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'Tests'))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 from Toolbox import *
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 ##
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51 ## Parse the command-line arguments
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52 ##
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 parser = argparse.ArgumentParser(description = 'Run the integration tests for the DICOMweb plugin.')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 parser.add_argument('--server',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 default = 'localhost',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 help = 'Address of the Orthanc server to test')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 parser.add_argument('--rest',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 type = int,
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	61 default = 8042,
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 help = 'Port to the REST API')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 parser.add_argument('--username',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 default = 'alice',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 help = 'Username to the REST API')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66 parser.add_argument('--password',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 default = 'orthanctest',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 help = 'Password to the REST API')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 parser.add_argument('--wado',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 default = '/wado',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 help = 'Path to the WADO API')
33 eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	72 parser.add_argument('--dicomweb',
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 default = '/dicom-web/',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 help = 'Path to the DICOMweb API')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75 parser.add_argument('--force', help = 'Do not warn the user',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76 action = 'store_true')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 parser.add_argument('options', metavar = 'N', nargs = '*',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78 help='Arguments to Python unittest')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 args = parser.parse_args()
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83 ##
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84 ## Configure the testing context
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 ##
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87 if not args.force:
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88 print("""
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89 WARNING: This test will remove all the content of your
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90 Orthanc instance running on %s!
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 Are you sure ["yes" to go on]?""" % args.server)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94 if sys.stdin.readline().strip() != 'yes':
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 print('Aborting...')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96 exit(0)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99 ORTHANC = DefineOrthanc(server = args.server,
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	100 username = args.username,
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101 password = args.password,
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102 restPort = args.rest)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	103
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	104
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	105 ##
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	106 ## The tests
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107 ##
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	108
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	109
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	110 def UploadAndGetWadoPath(dicom):
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	111 i = UploadInstance(ORTHANC, dicom) ['ID']
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	112 study = DoGet(ORTHANC, '/instances/%s/tags?simplify' % i) ['StudyInstanceUID']
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	113 series = DoGet(ORTHANC, '/instances/%s/tags?simplify' % i) ['SeriesInstanceUID']
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	114 instance = DoGet(ORTHANC, '/instances/%s/tags?simplify' % i) ['SOPInstanceUID']
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	115 return '/studies/%s/series/%s/instances/%s' % (study, series, instance)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	116
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	117
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	118
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	119 class Orthanc(unittest.TestCase):
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	120 def setUp(self):
83 3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	121 if (sys.version_info >= (3, 0)):
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	122 # Remove annoying warnings about unclosed socket in Python 3
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	123 import warnings
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	124 warnings.simplefilter("ignore", ResourceWarning)
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	125
270 082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	126 #print("In test: ", self._testMethodName)
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	127
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128 DropOrthanc(ORTHANC)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	129
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130 def test_wado_dicom(self):
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131 UploadInstance(ORTHANC, 'Brainix/Flair/IM-0001-0001.dcm')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	132
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133 SIZE = 169478
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134 INSTANCE = '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549'
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 SERIES = '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497'
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136 STUDY = '2.16.840.1.113669.632.20.1211.10000357775'
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 self.assertRaises(Exception, lambda: DoGet(ORTHANC, args.wado))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 self.assertRaises(Exception, lambda: DoGet(ORTHANC, args.wado + '?requestType=WADO'))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140 self.assertRaises(Exception, lambda: DoGet(ORTHANC, args.wado + '?objectUID=%s' % INSTANCE))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142 dicom = DoGet(ORTHANC, args.wado + '?contentType=application/dicom&requestType=WADO&objectUID=%s' % INSTANCE)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 self.assertEqual(SIZE, len(dicom))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 dicom = DoGet(ORTHANC, args.wado + '?contentType=application/dicom&requestType=WADO&objectUID=%s&seriesUID=%s' % (INSTANCE, SERIES))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 self.assertEqual(SIZE, len(dicom))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 dicom = DoGet(ORTHANC, args.wado + '?contentType=application/dicom&requestType=WADO&objectUID=%s&seriesUID=%s&studyUID=%s' % (INSTANCE, SERIES, STUDY))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149 self.assertEqual(SIZE, len(dicom))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151 dicom = DoGet(ORTHANC, args.wado + '?contentType=application/dicom&requestType=WADO&objectUID=%s&seriesUID=%s' % (INSTANCE, SERIES))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152 self.assertEqual(SIZE, len(dicom))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154 dicom = DoGet(ORTHANC, args.wado + '?contentType=application/dicom&requestType=WADO&objectUID=%s&studyUID=%s' % (INSTANCE, STUDY))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155 self.assertEqual(SIZE, len(dicom))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 self.assertRaises(Exception, lambda: DoGet(ORTHANC, args.wado + '?requestType=WADO&objectUID=%s&seriesUID=nope' % INSTANCE))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 self.assertRaises(Exception, lambda: DoGet(ORTHANC, args.wado + '?requestType=WADO&objectUID=%s&studyUID=nope' % INSTANCE))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	159 self.assertRaises(Exception, lambda: DoGet(ORTHANC, args.wado + '?requestType=WADO&objectUID=%s&seriesUID=nope&studyUID=nope' % INSTANCE))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	160
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	161 def test_wado_image(self):
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162 UploadInstance(ORTHANC, 'Phenix/IM-0001-0001.dcm')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 INSTANCE = '1.2.840.113704.7.1.1.6632.1127829031.2'
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	164
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	165 im = GetImage(ORTHANC, args.wado + '?requestType=WADO&objectUID=%s' % INSTANCE)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166 self.assertEqual('JPEG', im.format)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167 self.assertEqual('L', im.mode)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168 self.assertEqual(512, im.size[0])
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169 self.assertEqual(358, im.size[1])
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	170
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 im = GetImage(ORTHANC, args.wado + '?contentType=image/jpg&requestType=WADO&objectUID=%s' % INSTANCE)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	172 self.assertEqual('JPEG', im.format)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174 im = GetImage(ORTHANC, args.wado + '?contentType=image/png&requestType=WADO&objectUID=%s' % INSTANCE)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175 self.assertEqual('PNG', im.format)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	176 self.assertEqual('L', im.mode)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177 self.assertEqual(512, im.size[0])
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178 self.assertEqual(358, im.size[1])
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	179
33 eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	180 def test_stow(self):
eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	181 self.assertEqual(0, len(DoGet(ORTHANC, '/instances')))
eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	182 SendStow(ORTHANC, args.dicomweb + '/studies', GetDatabasePath('Phenix/IM-0001-0001.dcm'))
eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	183 self.assertEqual(1, len(DoGet(ORTHANC, '/instances')))
eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	184 a = SendStow(ORTHANC, args.dicomweb + '/studies', GetDatabasePath('Phenix/IM-0001-0001.dcm'))
eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	185 self.assertEqual(1, len(DoGet(ORTHANC, '/instances')))
eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	186
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	187 self.assertEqual(4, len(a))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	188
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	189 # Specific character set
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	190 self.assertTrue('00080005' in a)
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	191 self.assertEqual('CS', a['00080005']['vr'])
33 eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	192
eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	193 self.assertTrue(a['00081190']['Value'][0].endswith('studies/2.16.840.1.113669.632.20.1211.10000098591'))
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	194 self.assertEqual('UR', a['00081190']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	195
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	196 self.assertFalse('Value' in a['00081198']) # No error => empty sequence
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	197 self.assertEqual('SQ', a['00081198']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	198
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	199 self.assertEqual(1, len(a['00081199']['Value'])) # 1 success
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	200 self.assertEqual('SQ', a['00081199']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	201
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	202 b = a['00081199']['Value'][0]
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	203
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	204 # Referenced SOP class UID
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	205 self.assertEqual('UI', b['00081150']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	206 self.assertEqual(1, len(b['00081150']['Value']))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	207 self.assertEqual('1.2.840.10008.5.1.4.1.1.2', b['00081150']['Value'][0])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	208
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	209 # Referenced SOP instance UID
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	210 self.assertEqual('UI', b['00081155']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	211 self.assertEqual(1, len(b['00081155']['Value']))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	212 self.assertEqual('1.2.840.113704.7.1.1.6632.1127829031.2', b['00081155']['Value'][0])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	213
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	214 # Retrieve URL
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	215 self.assertEqual('UR', b['00081190']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	216 self.assertEqual(1, len(b['00081190']['Value']))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	217 self.assertTrue(b['00081190']['Value'][0].
33 eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	218 endswith('series/1.2.840.113704.1.111.5692.1127828999.2/instances/1.2.840.113704.7.1.1.6632.1127829031.2'))
eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	219
83 3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	220 # Remove the "http://localhost:8042" prefix
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	221 url = a['00081190']['Value'][0]
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	222 url = re.sub(r'(http\|https)://[^/]+(/.*)', r'\2', url)
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	223
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	224 # Get the content-length of all the multiparts of this WADO-RS request
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	225 b = DoGet(ORTHANC, url).decode('utf-8', 'ignore')
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	226 parts = re.findall(r'^Content-Length:\s(\d+)\s', b, re.IGNORECASE \| re.MULTILINE)
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	227 self.assertEqual(1, len(parts))
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	228 self.assertEqual(os.path.getsize(GetDatabasePath('Phenix/IM-0001-0001.dcm')), int(parts[0]))
33 eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	229
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	230
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	231 def test_server_get(self):
277 95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	232 try:
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	233 DoDelete(ORTHANC, '/dicom-web/servers/google') # If "AllWindowsStart.sh" is used
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	234 except:
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	235 pass
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	236
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	237 UploadInstance(ORTHANC, 'Knee/T1/IM-0001-0001.dcm')
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	238
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	239 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/servers')))
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	240 self.assertTrue('sample' in DoGet(ORTHANC, '/dicom-web/servers'))
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	241
129 53d522dd4a38 added tests for ?expand in /dicom-web/servers route amazy parents: 114 diff changeset	242 serversReadback = DoGet(ORTHANC, '/dicom-web/servers?expand')
53d522dd4a38 added tests for ?expand in /dicom-web/servers route amazy parents: 114 diff changeset	243 self.assertEqual('http://localhost:8042/dicom-web/', serversReadback['sample']['Url'])
53d522dd4a38 added tests for ?expand in /dicom-web/servers route amazy parents: 114 diff changeset	244 self.assertEqual('alice', serversReadback['sample']['Username'])
53d522dd4a38 added tests for ?expand in /dicom-web/servers route amazy parents: 114 diff changeset	245
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	246 sample = DoGet(ORTHANC, '/dicom-web/servers/sample')
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	247 self.assertEqual(5, len(sample))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	248 self.assertTrue('stow' in sample)
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	249 self.assertTrue('retrieve' in sample)
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	250 self.assertTrue('get' in sample)
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	251 self.assertTrue('wado' in sample) # New in 0.7
49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	252 self.assertTrue('qido' in sample) # New in 0.7
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	253
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	254 # application/dicom+xml
131 90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	255 self.assertEqual(2, len(re.findall('^--', DoGet(ORTHANC, '/dicom-web/studies',
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	256 headers = { 'Accept' : 'application/dicom+xml' }),
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	257 re.MULTILINE)))
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	258 self.assertEqual(2, len(re.findall('^--', DoPost
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	259 (ORTHANC, '/dicom-web/servers/sample/get',
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	260 { 'Uri' : '/studies',
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	261 'HttpHeaders' : { 'Accept' : 'application/dicom+xml' }
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	262 }), re.MULTILINE)))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	263
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	264 # application/dicom+json
131 90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	265 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/studies',
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	266 headers = { 'Accept' : 'application/dicom+json' })))
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	267 self.assertEqual(1, len(DoPost(ORTHANC, '/dicom-web/servers/sample/get',
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	268 { 'Uri' : '/studies',
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	269 'HttpHeaders' : { 'Accept' : 'application/dicom+json' }})))
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	270
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	271 # application/json
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	272 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/studies',
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	273 headers = { 'Accept' : 'application/json' })))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	274 self.assertEqual(1, len(DoPost(ORTHANC, '/dicom-web/servers/sample/get',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	275 { 'Uri' : '/studies',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	276 'HttpHeaders' : { 'Accept' : 'application/json' }})))
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	277
131 90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	278 # application/dicom+json is the default as of OrthancDicomWeb-0.5
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	279 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/studies')))
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	280 self.assertEqual(1, len(DoPost(ORTHANC, '/dicom-web/servers/sample/get',
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	281 { 'Uri' : '/studies' })))
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	282
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	283
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	284 def test_server_stow(self):
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	285 UploadInstance(ORTHANC, 'Knee/T1/IM-0001-0001.dcm')
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	286
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	287 self.assertRaises(Exception, lambda:
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	288 DoPost(ORTHANC, '/dicom-web/servers/sample/stow',
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	289 { 'Resources' : [ 'nope' ],
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	290 'Synchronous' : True })) # inexisting resource
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	291
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	292 l = 2 # For >= 0.7
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	293 #l = 0 # For <= 0.6
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	294
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	295 self.assertEqual(l, len(DoPost(ORTHANC, '/dicom-web/servers/sample/stow',
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	296 { 'Resources' : [ '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' ],
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	297 'Synchronous' : True }))) # study
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	298
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	299 self.assertEqual(l, len(DoPost(ORTHANC, '/dicom-web/servers/sample/stow',
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	300 { 'Resources' : [ '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' ],
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	301 'Synchronous' : True }))) # series
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	302
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	303 self.assertEqual(l, len(DoPost(ORTHANC, '/dicom-web/servers/sample/stow',
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	304 { 'Resources' : [ 'c8df6478-d7794217-0f11c293-a41237c9-31d98357' ],
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	305 'Synchronous' : True }))) # instance
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	306
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	307 self.assertEqual(l, len(DoPost(ORTHANC, '/dicom-web/servers/sample/stow',
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	308 { 'Resources' : [
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	309 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	310 '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	311 '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285',
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	312 'c8df6478-d7794217-0f11c293-a41237c9-31d98357' ],
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	313 'Synchronous' : True }))) # altogether
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	314
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	315
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	316 def test_server_retrieve(self):
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	317 COUNT = 'ReceivedInstancesCount'
49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	318 #COUNT = 'Instances' # In version <= 0.6
49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	319
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	320 UploadInstance(ORTHANC, 'Knee/T1/IM-0001-0001.dcm')
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	321 UploadInstance(ORTHANC, 'Knee/T1/IM-0001-0002.dcm')
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	322 UploadInstance(ORTHANC, 'Knee/T2/IM-0001-0001.dcm')
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	323
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	324 self.assertRaises(Exception, lambda:
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	325 DoPost(ORTHANC, '/dicom-web/servers/sample/retrieve',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	326 { 'Resources' : [ { 'Study' : 'nope' } ]})) # inexisting resource
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	327
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	328 t = DoPost(ORTHANC, '/dicom-web/servers/sample/retrieve',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	329 { 'Resources' : [ { 'Study' : '2.16.840.1.113669.632.20.121711.10000160881' } ] })
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	330 self.assertEqual(3, int(t[COUNT]))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	331
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	332 # Missing "Study" field
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	333 self.assertRaises(Exception, lambda:
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	334 DoPost(ORTHANC, '/dicom-web/servers/sample/retrieve',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	335 { 'Resources' : [ { 'Series' : '1.3.46.670589.11.17521.5.0.3124.2008081908564160709' } ]}))
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	336
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	337 t = DoPost(ORTHANC, '/dicom-web/servers/sample/retrieve',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	338 { 'Resources' : [ { 'Study' : '2.16.840.1.113669.632.20.121711.10000160881',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	339 'Series' : '1.3.46.670589.11.17521.5.0.3124.2008081908564160709' } ] })
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	340 self.assertEqual(2, int(t[COUNT]))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	341
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	342 t = DoPost(ORTHANC, '/dicom-web/servers/sample/retrieve',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	343 { 'Resources' : [ { 'Study' : '2.16.840.1.113669.632.20.121711.10000160881',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	344 'Series' : '1.3.46.670589.11.17521.5.0.3124.2008081909090037350' } ] })
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	345 self.assertEqual(1, int(t[COUNT]))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	346
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	347 t = DoPost(ORTHANC, '/dicom-web/servers/sample/retrieve',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	348 { 'Resources' : [ { 'Study' : '2.16.840.1.113669.632.20.121711.10000160881',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	349 'Series' : '1.3.46.670589.11.17521.5.0.3124.2008081909090037350' },
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	350 { 'Study' : '2.16.840.1.113669.632.20.121711.10000160881',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	351 'Series' : '1.3.46.670589.11.17521.5.0.3124.2008081908564160709' } ] })
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	352 self.assertEqual(3, int(t[COUNT]))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	353
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	354 t = DoPost(ORTHANC, '/dicom-web/servers/sample/retrieve',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	355 { 'Resources' : [ { 'Study' : '2.16.840.1.113669.632.20.121711.10000160881',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	356 'Series' : '1.3.46.670589.11.17521.5.0.3124.2008081909090037350',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	357 'Instance' : '1.3.46.670589.11.17521.5.0.3124.2008081909113806560' } ] })
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	358 self.assertEqual(1, int(t[COUNT]))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	359
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	360
114 a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	361 def test_bitbucket_issue_53(self):
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	362 # DICOMWeb plugin support for "limit" and "offset" parameters in QIDO-RS
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	363 # https://bugs.orthanc-server.com/show_bug.cgi?id=53
114 a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	364
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	365 UploadInstance(ORTHANC, 'Brainix/Flair/IM-0001-0001.dcm')
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	366 UploadInstance(ORTHANC, 'Knee/T1/IM-0001-0001.dcm')
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	367
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	368 brainix = '2.16.840.1.113669.632.20.1211.10000357775'
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	369 knee = '2.16.840.1.113669.632.20.121711.10000160881'
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	370
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	371 a = DoGet(ORTHANC, '/dicom-web/studies',
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	372 headers = { 'accept' : 'application/json' })
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	373 self.assertEqual(2, len(a))
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	374
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	375 b = []
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	376 a = DoGet(ORTHANC, '/dicom-web/studies?limit=1',
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	377 headers = { 'accept' : 'application/json' })
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	378 self.assertEqual(1, len(a))
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	379 b.append(a[0]['0020000D']['Value'][0])
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	380
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	381 a = DoGet(ORTHANC, '/dicom-web/studies?limit=1&offset=1',
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	382 headers = { 'accept' : 'application/json' })
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	383 self.assertEqual(1, len(a))
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	384 b.append(a[0]['0020000D']['Value'][0])
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	385
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	386 self.assertTrue(brainix in b)
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	387 self.assertTrue(knee in b)
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	388
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	389
184 e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	390 def test_bitbucket_issue_111(self):
223 f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	391 # Wrong serialization of empty values
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	392 # https://bugs.orthanc-server.com/show_bug.cgi?id=111
de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	393 # https://bitbucket.org/sjodogne/orthanc-dicomweb/issues/3
223 f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	394
184 e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	395 # According to the standard, section F.2.5
e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	396 # (http://dicom.nema.org/medical/dicom/current/output/chtml/part18/sect_F.2.5.html),
e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	397 # null values behave as follows: If an attribute is present in
e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	398 # DICOM but empty (i.e., Value Length is 0), it shall be
e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	399 # preserved in the DICOM JSON attribute object containing no
e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	400 # "Value", "BulkDataURI" or "InlineBinary".
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	401 # https://bugs.orthanc-server.com/show_bug.cgi?id=111
184 e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	402
223 f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	403 UploadInstance(ORTHANC, 'Issue111.dcm')
184 e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	404
223 f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	405 # Test WADO-RS
f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	406 a = DoGet(ORTHANC, '/dicom-web/studies/1.2.276.0.7230010.3.1.2.8323329.30185.1551199973.371589/metadata')
f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	407 self.assertEqual(1, len(a))
f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	408 self.assertTrue('00080050' in a[0]) # AccessionNumber is null
f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	409 self.assertEqual(1, len(a[0]['00080050'])) # 'vr' is the only field to be present
f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	410 self.assertEqual('SH', a[0]['00080050']['vr'])
184 e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	411
223 f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	412 # Test QIDO-RS
f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	413 a = DoGet(ORTHANC, '/dicom-web/studies')
184 e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	414 self.assertEqual(1, len(a))
e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	415 self.assertTrue('00080050' in a[0]) # AccessionNumber is null
e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	416 self.assertEqual(1, len(a[0]['00080050'])) # 'vr' is the only field to be present
e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	417 self.assertEqual('SH', a[0]['00080050']['vr'])
e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	418
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	419
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	420 def test_wado_hierarchy(self):
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	421 def CheckJson(uri, headers = {}):
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	422 with open(GetDatabasePath('DummyCT.json'), 'r') as f:
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	423 expected = json.loads(f.read())
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	424 actual = DoGet(ORTHANC, uri, headers)
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	425 self.assertEqual(1, len(actual))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	426 AssertAlmostEqualRecursive(self, expected, actual[0])
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	427
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	428 UploadInstance(ORTHANC, 'DummyCT.dcm')
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	429 study = '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390'
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	430 series = '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394'
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	431 instance = '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109'
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	432
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	433 URI = '/dicom-web/studies/%s/series/%s/instances/%s/metadata'
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	434 self.assertRaises(Exception, lambda: DoGet(ORTHANC, URI % (study, series, instance),
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	435 headers = { 'accept' : 'application/nope' }))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	436
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	437 CheckJson(URI % (study, series, instance), headers = { 'accept' : 'application/dicom+json' })
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	438 CheckJson('/dicom-web/studies/%s/series/%s/metadata' % (study, series))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	439 CheckJson('/dicom-web/studies/%s/metadata' % study)
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	440
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	441 self.assertRaises(Exception, lambda: DoGet(ORTHANC, URI % ('nope', series, instance)))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	442 self.assertRaises(Exception, lambda: DoGet(ORTHANC, URI % (study, 'nope', instance)))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	443 self.assertRaises(Exception, lambda: DoGet(ORTHANC, URI % (study, series, 'nope')))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	444 self.assertRaises(Exception, lambda: DoGet(ORTHANC, '/dicom-web/studies/%s/series/%s/metadata' % ('nope', series)))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	445 self.assertRaises(Exception, lambda: DoGet(ORTHANC, '/dicom-web/studies/%s/series/%s/metadata' % (study, 'nope')))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	446 self.assertRaises(Exception, lambda: DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % 'nope'))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	447
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	448
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	449 def test_wado_pixel_data(self):
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	450 orthanc = UploadInstance(ORTHANC, 'Issue29.dcm') ['ID']
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	451 a = DoGet(ORTHANC, '/dicom-web/instances')
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	452 self.assertEqual(1, len(a))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	453 url = a[0]['00081190']['Value'][0]
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	454
278 514785dacd6d fix dicomweb tests with debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 277 diff changeset	455 prefix = 'http://%s:%s' % (args.server, args.rest)
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	456 self.assertTrue(url.startswith(prefix))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	457
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	458 b = DoGet(ORTHANC, url[len(prefix):] + '/metadata')
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	459 self.assertEqual('OB', b[0]['7FE00010']['vr'])
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	460 self.assertEqual(2, len(b[0]['7FE00010']))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	461 self.assertTrue('BulkDataURI' in b[0]['7FE00010'])
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	462
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	463 url = b[0]['7FE00010']['BulkDataURI']
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	464 self.assertTrue(url.startswith(prefix))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	465
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	466 p = DoGetMultipart(ORTHANC, url[len(prefix):])
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	467
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	468 self.assertEqual(2, len(p)) # There are 2 fragments in this image
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	469 self.assertEqual(4, len(p[0]))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	470 self.assertEqual(114486, len(p[1]))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	471
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	472
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	473 def test_wado_hierarchy_bulk(self):
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	474 def CheckBulk(value, bulk):
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	475 self.assertEqual(2, len(value))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	476 self.assertTrue('BulkDataURI' in value)
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	477 self.assertTrue('vr' in value)
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	478 self.assertEqual(value['BulkDataURI'], bulk)
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	479
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	480 orthanc = UploadInstance(ORTHANC, 'PrivateTags.dcm') ['ID']
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	481 study = '1.2.840.113619.2.115.147416.1094281639.0.29'
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	482 series = '1.2.840.113619.2.115.147416.1094281639.0.30'
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	483 sop = '1.2.840.113619.2.115.147416.1094281639.0.38'
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	484
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	485 # WARNING: This test will fail on Orthanc <= 1.5.5, because
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	486 # the following fix was not included yet:
de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	487 # https://hg.orthanc-server.com/orthanc/rev/b88937ef597b
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	488
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	489 a = DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study)
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	490 self.assertEqual(1, len(a))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	491
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	492 BASE_URI = '/dicom-web/studies/%s/series/%s/instances/%s/bulk' % (study, series, sop)
278 514785dacd6d fix dicomweb tests with debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 277 diff changeset	493 BASE_URL = 'http://%s:%s%s' % (args.server, args.rest, BASE_URI)
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	494
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	495 self.assertEqual(2, len(a[0]['60031010']['Value']))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	496 CheckBulk(a[0]['60031010']['Value'][0]['60031011'], '%s/60031010/1/60031011' % BASE_URL)
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	497 CheckBulk(a[0]['60031010']['Value'][1]['60031011'], '%s/60031010/2/60031011' % BASE_URL)
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	498 CheckBulk(a[0]['7FE00010'], '%s/7fe00010' % BASE_URL)
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	499
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	500 b = DoGetRaw(ORTHANC, '/instances/%s/content/6003-1010/0/6003-1011' % orthanc) [1]
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	501 c = DoGetMultipart(ORTHANC, '%s/60031010/1/60031011' % BASE_URI)
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	502
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	503 self.assertEqual(12288, len(b))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	504 self.assertEqual(1, len(c))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	505 self.assertEqual(b, c[0])
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	506
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	507
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	508 def test_bitbucket_issue_112(self):
223 f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	509 # Wrong serialization of number values
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	510 # https://bugs.orthanc-server.com/show_bug.cgi?id=112
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	511 # https://bitbucket.org/sjodogne/orthanc-dicomweb/issues/4/
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	512
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	513 UploadInstance(ORTHANC, 'DummyCT.dcm')
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	514 study = '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390'
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	515
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	516 # This is the WADO-RS testing
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	517 a = DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study)
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	518 self.assertEqual(1, len(a))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	519 self.assertEqual('IS', a[0]['00180091']['vr']) # EchoTrainLength
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	520
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	521 if (sys.version_info >= (3, 0)):
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	522 types = (int)
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	523 else:
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	524 types = (int, long)
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	525
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	526 b = a[0]['00180091']['Value'][0]
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	527 self.assertTrue(isinstance(b, types))
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	528 self.assertEqual(10, b)
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	529
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	530 # This is the QIDO-RS testing
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	531 a = DoGet(ORTHANC, '/dicom-web/studies')
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	532 self.assertEqual(1, len(a))
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	533 self.assertEqual('IS', a[0]['00201208']['vr']) # Number of Study Related Instances
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	534
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	535 b = a[0]['00201208']['Value'][0]
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	536 self.assertTrue(isinstance(b, types))
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	537 self.assertEqual(1, b)
223 f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	538
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	539
224 f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	540 def test_bitbucket_issue_113(self):
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	541 # Wrong serialization of PN VR
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	542 # https://bugs.orthanc-server.com/show_bug.cgi?id=113
224 f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	543 # https://bitbucket.org/sjodogne/orthanc-dicomweb/issues/2/
314 59e8a50bef00 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	544
59e8a50bef00 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	545 # Make sure UTF-8 encoding is used
59e8a50bef00 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	546 self.assertEqual('Utf8', DoPut(ORTHANC, '/tools/default-encoding', 'Utf8'))
224 f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	547
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	548 UploadInstance(ORTHANC, 'Encodings/DavidClunie/SCSX1')
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	549 study = '1.3.6.1.4.1.5962.1.2.0.1175775771.5711.0'
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	550
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	551 # This is the WADO-RS testing
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	552 a = DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study)
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	553 self.assertEqual(1, len(a))
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	554
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	555 pn = a[0]['00100010'] # Patient name
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	556 self.assertEqual('PN', pn['vr'])
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	557 self.assertEqual(1, len(pn['Value']))
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	558 self.assertEqual('Wang^XiaoDong', pn['Value'][0]['Alphabetic'])
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	559 self.assertEqual(u'王^小東', pn['Value'][0]['Ideographic'])
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	560
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	561 # This is the QIDO-RS testing
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	562 a = DoGet(ORTHANC, '/dicom-web/studies')
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	563 self.assertEqual(1, len(a))
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	564
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	565 pn = a[0]['00100010'] # Patient name
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	566 self.assertEqual('PN', pn['vr'])
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	567 self.assertEqual(1, len(pn['Value']))
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	568 self.assertEqual('Wang^XiaoDong', pn['Value'][0]['Alphabetic'])
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	569 self.assertEqual(u'王^小東', pn['Value'][0]['Ideographic'])
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	570
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	571
225 4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	572 def test_bitbucket_issue_96(self):
4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	573 # WADO-RS RetrieveFrames rejects valid accept headers
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	574 # https://bugs.orthanc-server.com/show_bug.cgi?id=96
225 4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	575 # https://bitbucket.org/sjodogne/orthanc-dicomweb/issues/5/
4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	576
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	577 UploadInstance(ORTHANC, 'Brainix/Epi/IM-0001-0001.dcm')
225 4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	578
4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	579 a = DoGet(ORTHANC, '/dicom-web/instances')
4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	580 self.assertEqual(1, len(a))
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	581 self.assertEqual(256, a[0]['00280010']['Value'][0]) # Rows
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	582 self.assertEqual(256, a[0]['00280011']['Value'][0]) # Columns
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	583 self.assertEqual(16, a[0]['00280100']['Value'][0]) # Bits allocated
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	584
225 4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	585 url = a[0]['00081190']['Value'][0]
4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	586
278 514785dacd6d fix dicomweb tests with debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 277 diff changeset	587 prefix = 'http://%s:%s' % (args.server, args.rest)
225 4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	588 self.assertTrue(url.startswith(prefix))
4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	589 uri = url[len(prefix):]
4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	590
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	591 self.assertRaises(Exception, lambda: DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 0)))
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	592 self.assertRaises(Exception, lambda: DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 2)))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	593
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	594 b = DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 1))
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	595 self.assertEqual(1, len(b))
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	596 self.assertEqual(256 * 256 * 2, len(b[0]))
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	597 self.assertEqual('ce394eb4d4de4eeef348436108101f3b', ComputeMD5(b[0]))
225 4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	598
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	599 c = DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 1),
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	600 headers = { 'Accept' : 'multipart/related; type=application/octet-stream' })
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	601 self.assertEqual(1, len(c))
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	602 self.assertEqual(b[0], c[0])
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	603 self.assertEqual('ce394eb4d4de4eeef348436108101f3b', ComputeMD5(c[0]))
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	604
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	605 c = DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 1),
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	606 headers = { 'Accept' : 'multipart/related; type="application/octet-stream"' })
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	607 self.assertEqual(1, len(c))
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	608 self.assertEqual(b[0], c[0])
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	609 self.assertEqual('ce394eb4d4de4eeef348436108101f3b', ComputeMD5(c[0]))
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	610
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	611 self.assertRaises(Exception, lambda: DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 1),
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	612 headers = { 'Accept' : 'multipart/related; type="nope"' }))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	613
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	614 self.assertRaises(Exception, lambda: DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 1),
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	615 headers = { 'Accept' : 'multipart/related; type=nope' }))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	616
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	617 self.assertRaises(Exception, lambda: DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 1),
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	618 headers = { 'Accept' : 'nope' }))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	619
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	620
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	621 def test_qido_fields(self):
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	622 UploadInstance(ORTHANC, 'DummyCT.dcm')
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	623
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	624 a = DoGet(ORTHANC, '/dicom-web/studies')
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	625 self.assertEqual(1, len(a))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	626 self.assertFalse('00280010' in a[0]) # Rows
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	627
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	628 a = DoGet(ORTHANC, '/dicom-web/studies?includefield=Rows')
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	629 self.assertEqual(1, len(a))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	630 self.assertTrue('00280010' in a[0])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	631 self.assertEqual(512, a[0]['00280010']['Value'][0])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	632
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	633 a = DoGet(ORTHANC, '/dicom-web/studies?Rows=128')
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	634 self.assertEqual(0, len(a))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	635
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	636 a = DoGet(ORTHANC, '/dicom-web/studies?Rows=512')
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	637 self.assertEqual(1, len(a))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	638 self.assertTrue('00280010' in a[0])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	639 self.assertEqual(512, a[0]['00280010']['Value'][0])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	640
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	641
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	642 def test_stow_errors(self):
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	643 # Pushing an instance to a study that is not its parent
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	644 a = SendStow(ORTHANC, args.dicomweb + '/studies/nope', GetDatabasePath('Phenix/IM-0001-0001.dcm'))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	645 self.assertEqual(3, len(a))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	646 self.assertTrue('00080005' in a)
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	647 self.assertEqual('CS', a['00080005']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	648 self.assertTrue('00081198' in a)
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	649 self.assertEqual('SQ', a['00081198']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	650 self.assertEqual(1, len(['00081198']))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	651 self.assertTrue('00081199' in a)
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	652 self.assertEqual('SQ', a['00081199']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	653 self.assertEqual(1, len(['00081199']))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	654
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	655 # Pushing an instance with missing tags
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	656 a = SendStow(ORTHANC, args.dicomweb + '/studies', GetDatabasePath('Issue111.dcm'))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	657 self.assertEqual(3, len(a))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	658 self.assertTrue('00080005' in a)
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	659 self.assertEqual('CS', a['00080005']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	660 self.assertTrue('00081198' in a)
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	661 self.assertEqual('SQ', a['00081198']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	662 self.assertEqual(1, len(['00081198']))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	663 self.assertTrue('00081199' in a)
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	664 self.assertEqual('SQ', a['00081199']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	665 self.assertEqual(1, len(['00081199']))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	666
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	667 # Pushing a file that is not in the DICOM format
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	668 a = SendStow(ORTHANC, args.dicomweb + '/studies', GetDatabasePath('Issue111.dump'))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	669 self.assertEqual(3, len(a))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	670 self.assertTrue('00080005' in a)
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	671 self.assertEqual('CS', a['00080005']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	672 self.assertTrue('00081198' in a)
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	673 self.assertEqual('SQ', a['00081198']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	674 self.assertEqual(1, len(['00081198']))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	675 self.assertTrue('00081199' in a)
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	676 self.assertEqual('SQ', a['00081199']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	677 self.assertEqual(1, len(['00081199']))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	678
239 8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	679
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	680 def test_allowed_methods(self):
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	681 self.assertEqual(0, len(DoGet(ORTHANC, '/dicom-web/studies')))
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	682
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	683 with self.assertRaises(Exception) as e:
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	684 DoPut(ORTHANC, '/dicom-web/studies')
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	685
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	686 self.assertEqual(405, e.exception[0])
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	687 self.assertEqual("GET,POST", e.exception[1]['allow'])
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	688
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	689 with self.assertRaises(Exception) as e:
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	690 DoDelete(ORTHANC, '/dicom-web/studies')
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	691
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	692 self.assertEqual(405, e.exception[0])
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	693 self.assertEqual("GET,POST", e.exception[1]['allow'])
241 adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	694
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	695
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	696 def test_add_server(self):
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	697 try:
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	698 DoDelete(ORTHANC, '/dicom-web/servers/hello')
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	699 except:
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	700 pass
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	701
277 95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	702 try:
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	703 DoDelete(ORTHANC, '/dicom-web/servers/google') # If "AllWindowsStart.sh" is used
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	704 except:
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	705 pass
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	706
241 adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	707 l = DoGet(ORTHANC, '/dicom-web/servers')
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	708 self.assertEqual(1, len(l))
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	709 self.assertTrue('sample' in l)
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	710
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	711 url = 'http://localhost:8042/dicom-web/'
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	712 DoPut(ORTHANC, '/dicom-web/servers/hello', {
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	713 'Url': url,
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	714 'HttpHeaders' : {
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	715 'Hello' : 'World'
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	716 },
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	717 'Username' : 'bob',
242 c6ffdd0ea04b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 241 diff changeset	718 'Password' : 'password',
c6ffdd0ea04b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 241 diff changeset	719 'UserProperty' : 'Test',
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	720 'HasDelete' : True,
241 adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	721 })
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	722
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	723 l = DoGet(ORTHANC, '/dicom-web/servers')
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	724 self.assertEqual(2, len(l))
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	725 self.assertTrue('sample' in l)
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	726 self.assertTrue('hello' in l)
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	727
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	728 o = DoGet(ORTHANC, '/dicom-web/servers/sample')
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	729 self.assertEqual(5, len(o))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	730 self.assertTrue('stow' in o)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	731 self.assertTrue('retrieve' in o)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	732 self.assertTrue('get' in o)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	733 self.assertTrue('wado' in o) # New in 0.7
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	734 self.assertTrue('qido' in o) # New in 0.7
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	735
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	736 o = DoGet(ORTHANC, '/dicom-web/servers/hello')
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	737 self.assertEqual(6, len(o))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	738 self.assertTrue('stow' in o)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	739 self.assertTrue('retrieve' in o)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	740 self.assertTrue('get' in o)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	741 self.assertTrue('wado' in o) # New in 0.7
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	742 self.assertTrue('qido' in o) # New in 0.7
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	743 self.assertTrue('delete' in o) # New in 0.7
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	744
241 adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	745 s = DoGet(ORTHANC, '/dicom-web/servers?expand')
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	746 self.assertEqual(7, len(s['hello']))
241 adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	747 self.assertEqual(url, s['hello']['Url'])
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	748 self.assertEqual('bob', s['hello']['Username'])
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	749 self.assertEqual(None, s['hello']['Password'])
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	750 self.assertFalse(s['hello']['Pkcs11'])
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	751 self.assertEqual(1, len(s['hello']['HttpHeaders']))
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	752 self.assertTrue('Hello' in s['hello']['HttpHeaders'])
242 c6ffdd0ea04b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 241 diff changeset	753 self.assertEqual('Test', s['hello']['UserProperty'])
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	754 self.assertEqual('1', s['hello']['HasDelete'])
241 adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	755
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	756 DoDelete(ORTHANC, '/dicom-web/servers/hello')
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	757
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	758
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	759 def test_bitbucket_issue_143(self):
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	760 # WADO-RS metadata request returns "500 Internal Server Error"
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	761 # instead of "404 Not Found" for missing instance
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	762 # https://bugs.orthanc-server.com/show_bug.cgi?id=143
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	763 UploadInstance(ORTHANC, 'Issue143.dcm')
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	764
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	765 try:
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	766 DoGet(ORTHANC, '/dicom-web/studies/1.2.840.113619.2.55.3.671756986.106.1316467036.460/series/1.2.840.113619.2.55.3.671756986.106.1316467036.465/instances/0.0.0.0.0/metadata')
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	767 self.assertFail()
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	768 except Exception as e:
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	769 self.assertEqual(404, e[0])
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	770
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	771 DoGet(ORTHANC, '/dicom-web/studies/1.3.6.1.4.1.34261.90254037371867.41912.1553085024.2/series/1.3.6.1.4.1.34261.90254037371867.41912.1553085024.3/instances/1.2.276.0.7230010.3.1.4.253549293.36648.1555586123.754/metadata')
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	772
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	773 try:
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	774 DoGet(ORTHANC, '/dicom-web/studies/0.0.0.0.0/series/1.3.6.1.4.1.34261.90254037371867.41912.1553085024.3/instances/1.2.276.0.7230010.3.1.4.253549293.36648.1555586123.754/metadata')
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	775 self.fail()
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	776 except Exception as e:
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	777 self.assertEqual(404, e[0])
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	778
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	779 try:
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	780 DoGet(ORTHANC, '/dicom-web/studies/1.3.6.1.4.1.34261.90254037371867.41912.1553085024.2/series/0.0.0.0.0/instances/1.2.276.0.7230010.3.1.4.253549293.36648.1555586123.754/metadata')
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	781 self.assertFail()
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	782 except Exception as e:
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	783 self.assertEqual(404, e[0])
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	784
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	785 try:
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	786 DoGet(ORTHANC, '/dicom-web/studies/0.0.0.0.0/series/0.0.0.0.0/instances/0.0.0.0.0/metadata')
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	787 self.assertFail()
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	788 except Exception as e:
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	789 self.assertEqual(404, e[0])
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	790
248 26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	791
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	792 def test_encodings_qido(self):
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	793 # The "DefaultEncoding" condifuration option is set to "UTF8"
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	794 # in the integration tests, so all the QIDO-RS requests must
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	795 # lead to a "ISO_IR 192" specific character set
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	796 def GetPatientName(dicom, onlyAlphabetic):
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	797 i = UploadInstance(ORTHANC, dicom) ['ID']
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	798 j = DoGet(ORTHANC, '/instances/%s/tags?simplify' % i) ['StudyInstanceUID']
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	799 qido = DoGet(ORTHANC, '/dicom-web/studies?0020000D=%s' % j)
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	800 self.assertEqual(1, len(qido))
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	801 self.assertEqual('CS', qido[0]['00080005']['vr'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	802 self.assertEqual('ISO_IR 192', qido[0]['00080005']['Value'][0])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	803 if onlyAlphabetic:
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	804 self.assertEqual(1, len(qido[0]['00100010']['Value'][0]))
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	805 else:
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	806 self.assertEqual(3, len(qido[0]['00100010']['Value'][0]))
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	807 return qido[0]['00100010']['Value'][0]
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	808
314 59e8a50bef00 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	809 # Make sure UTF-8 encoding is used
59e8a50bef00 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	810 self.assertEqual('Utf8', DoPut(ORTHANC, '/tools/default-encoding', 'Utf8'))
59e8a50bef00 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	811
248 26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	812 # Check out "test_issue_95_encodings" in "../../Tests/Tests.py"
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	813
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	814 self.assertEqual(u'Buc^Jérôme', GetPatientName('Encodings/DavidClunie/SCSFREN', True) ['Alphabetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	815 self.assertEqual(u'Äneas^Rüdiger', GetPatientName('Encodings/DavidClunie/SCSGERM', True)['Alphabetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	816 self.assertEqual(u'Διονυσιος', GetPatientName('Encodings/DavidClunie/SCSGREEK', True)['Alphabetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	817 self.assertEqual(u'Люкceмбypг', GetPatientName('Encodings/DavidClunie/SCSRUSS', True)['Alphabetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	818 self.assertEqual(u'שרון^דבורה', GetPatientName('Encodings/DavidClunie/SCSHBRW', True)['Alphabetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	819 self.assertEqual(u'قباني^لنزار', GetPatientName('Encodings/DavidClunie/SCSARAB', True)['Alphabetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	820
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	821 self.assertEqual(u'Hong^Gildong', GetPatientName('Encodings/DavidClunie/SCSI2', False)['Alphabetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	822 self.assertEqual(u'洪^吉洞', GetPatientName('Encodings/DavidClunie/SCSI2', False)['Ideographic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	823 self.assertEqual(u'홍^길동', GetPatientName('Encodings/DavidClunie/SCSI2', False)['Phonetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	824 self.assertEqual(u'Wang^XiaoDong', GetPatientName('Encodings/DavidClunie/SCSX2', False)['Alphabetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	825 self.assertEqual(u'王^小东', GetPatientName('Encodings/DavidClunie/SCSX2', False)['Ideographic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	826 self.assertEqual(u'', GetPatientName('Encodings/DavidClunie/SCSX2', False)['Phonetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	827 self.assertEqual(u'Wang^XiaoDong', GetPatientName('Encodings/DavidClunie/SCSX1', False)['Alphabetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	828 self.assertEqual(u'王^小東', GetPatientName('Encodings/DavidClunie/SCSX1', False)['Ideographic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	829 self.assertEqual(u'', GetPatientName('Encodings/DavidClunie/SCSX1', False)['Phonetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	830 self.assertEqual(u'Yamada^Tarou', GetPatientName('Encodings/DavidClunie/SCSH31', False)['Alphabetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	831 self.assertEqual(u'山田^太郎', GetPatientName('Encodings/DavidClunie/SCSH31', False)['Ideographic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	832 self.assertEqual(u'やまだ^たろう', GetPatientName('Encodings/DavidClunie/SCSH31', False)['Phonetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	833 self.assertEqual(u'ﾔﾏﾀﾞ^ﾀﾛｳ', GetPatientName('Encodings/DavidClunie/SCSH32', False)['Alphabetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	834
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	835 # TODO - Not supported yet by the Orthanc core as of 1.5.7
248 26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	836 #self.assertEqual(u'山田^太郎', GetPatientName('Encodings/DavidClunie/SCSH32')['Ideographic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	837 #self.assertEqual(u'やまだ^たろう', GetPatientName('Encodings/DavidClunie/SCSH32')['Phonetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	838
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	839
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	840 def test_encodings_wado_metadata(self):
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	841 # If querying the instance metadata, the "DefaultEncoding"
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	842 # configuration is not used, but the actual encoding
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	843 def GetEncoding(dicom, length):
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	844 qido = DoGet(ORTHANC, '/dicom-web/%s/metadata' % UploadAndGetWadoPath(dicom))
248 26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	845 self.assertEqual(1, len(qido))
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	846 self.assertEqual(length, len(qido[0]['00080005']['Value']))
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	847 self.assertEqual('CS', qido[0]['00080005']['vr'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	848 return qido[0]['00080005']['Value']
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	849
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	850 self.assertEqual('ISO_IR 100', GetEncoding('Encodings/DavidClunie/SCSFREN', 1)[0])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	851 self.assertEqual('ISO_IR 100', GetEncoding('Encodings/DavidClunie/SCSGERM', 1)[0])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	852 self.assertEqual('ISO_IR 126', GetEncoding('Encodings/DavidClunie/SCSGREEK', 1)[0])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	853 self.assertEqual('ISO_IR 144', GetEncoding('Encodings/DavidClunie/SCSRUSS', 1)[0])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	854 self.assertEqual('ISO_IR 138', GetEncoding('Encodings/DavidClunie/SCSHBRW', 1)[0])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	855 self.assertEqual('ISO_IR 127', GetEncoding('Encodings/DavidClunie/SCSARAB', 1)[0])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	856 self.assertEqual('ISO 2022 IR 149', GetEncoding('Encodings/DavidClunie/SCSI2', 1)[0])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	857 self.assertEqual('GB18030', GetEncoding('Encodings/DavidClunie/SCSX2', 1)[0])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	858 self.assertEqual('ISO_IR 192', GetEncoding('Encodings/DavidClunie/SCSX1', 1)[0])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	859 self.assertEqual('ISO 2022 IR 87', GetEncoding('Encodings/DavidClunie/SCSH31', 1)[0])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	860 self.assertEqual('ISO 2022 IR 13', GetEncoding('Encodings/DavidClunie/SCSH32', 2)[0])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	861 self.assertEqual('ISO 2022 IR 87', GetEncoding('Encodings/DavidClunie/SCSH32', 2)[1])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	862
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	863
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	864 def test_rendered(self):
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	865 def RenderFrame(path, i):
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	866 return DoPost(ORTHANC, '/dicom-web/servers/sample/get', {
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	867 'Uri' : '%s/frames/%d/rendered' % (path, i)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	868 })
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	869
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	870 # This image has 76 frames
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	871 path = UploadAndGetWadoPath('Multiframe.dcm')
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	872
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	873 self.assertRaises(Exception, lambda: RenderFrame(path, 0))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	874
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	875 frame1 = RenderFrame(path, 1)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	876 im = UncompressImage(frame1)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	877 self.assertEqual("L", im.mode)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	878 self.assertEqual(512, im.size[0])
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	879 self.assertEqual(512, im.size[1])
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	880
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	881 im = UncompressImage(RenderFrame(path, 76))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	882 self.assertEqual("L", im.mode)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	883 self.assertEqual(512, im.size[0])
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	884 self.assertEqual(512, im.size[1])
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	885
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	886 self.assertRaises(Exception, lambda: RenderFrame(path, 77))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	887
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	888 defaultFrame = DoPost(ORTHANC, '/dicom-web/servers/sample/get', {
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	889 'Uri' : '%s/rendered' % path
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	890 })
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	891
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	892 self.assertEqual(len(frame1), len(defaultFrame))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	893 self.assertEqual(frame1, defaultFrame)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	894
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	895
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	896 # This image has 1 frame
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	897 path = UploadAndGetWadoPath('Phenix/IM-0001-0001.dcm')
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	898
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	899 self.assertRaises(Exception, lambda: RenderFrame(path, 0))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	900 self.assertRaises(Exception, lambda: RenderFrame(path, 2))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	901
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	902 frame1 = RenderFrame(path, 1)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	903 im = UncompressImage(frame1)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	904 self.assertEqual("L", im.mode)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	905 self.assertEqual(512, im.size[0])
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	906 self.assertEqual(358, im.size[1])
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	907
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	908 defaultFrame = DoPost(ORTHANC, '/dicom-web/servers/sample/get', {
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	909 'Uri' : '%s/rendered' % path
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	910 })
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	911
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	912 self.assertEqual(len(frame1), len(defaultFrame))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	913 self.assertEqual(frame1, defaultFrame)
259 298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	914
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	915
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	916 def test_qido_parent_attributes(self):
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	917 UploadInstance(ORTHANC, 'Brainix/Flair/IM-0001-0001.dcm')
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	918 study = '2.16.840.1.113669.632.20.1211.10000357775'
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	919 series = '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497'
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	920 instance = '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549'
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	921
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	922 a = DoGet(ORTHANC, '/dicom-web/studies')
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	923 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	924 self.assertFalse('00080018' in a[0]) # SOPInstanceUID
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	925 self.assertFalse('0020000E' in a[0]) # SeriesInstanceUID
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	926 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	927 self.assertEqual('BRAINIX', a[0]['00100010']['Value'][0]['Alphabetic'])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	928
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	929 a = DoGet(ORTHANC, '/dicom-web/studies?0020000D=%s' % study)
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	930 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	931 self.assertFalse('00080018' in a[0]) # SOPInstanceUID
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	932 self.assertFalse('0020000E' in a[0]) # SeriesInstanceUID
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	933 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	934 self.assertEqual('BRAINIX', a[0]['00100010']['Value'][0]['Alphabetic'])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	935
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	936 a = DoGet(ORTHANC, '/dicom-web/series')
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	937 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	938 self.assertFalse('00080018' in a[0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	939 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	940 self.assertEqual(series, a[0]['0020000E']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	941 self.assertEqual('MR', a[0]['00080060']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	942 self.assertEqual('BRAINIX', a[0]['00100010']['Value'][0]['Alphabetic'])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	943
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	944 a = DoGet(ORTHANC, '/dicom-web/instances')
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	945 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	946 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	947 self.assertEqual(series, a[0]['0020000E']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	948 self.assertEqual(instance, a[0]['00080018']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	949 self.assertEqual('MR', a[0]['00080060']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	950 self.assertEqual('BRAINIX', a[0]['00100010']['Value'][0]['Alphabetic'])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	951
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	952 a = DoGet(ORTHANC, '/dicom-web/studies/%s/series' % study)
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	953 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	954 self.assertFalse('00080018' in a[0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	955 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	956 self.assertEqual(series, a[0]['0020000E']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	957 self.assertEqual('MR', a[0]['00080060']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	958 self.assertEqual('BRAINIX', a[0]['00100010']['Value'][0]['Alphabetic'])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	959
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	960 a = DoGet(ORTHANC, '/dicom-web/studies/%s/series/%s/instances' % (study, series))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	961 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	962 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	963 self.assertEqual(series, a[0]['0020000E']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	964 self.assertEqual(instance, a[0]['00080018']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	965 self.assertEqual('MR', a[0]['00080060']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	966 self.assertEqual('BRAINIX', a[0]['00100010']['Value'][0]['Alphabetic'])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	967
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	968 # "If {StudyInstanceUID} is not specified, all Study-level
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	969 # attributes specified in Table 6.7.1-2" => Here,
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	970 # {StudyInstanceUID} is specified, so we must not get the
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	971 # PatientName.
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	972 # http://dicom.nema.org/medical/dicom/2019a/output/html/part18.html#table_6.7.1-2a
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	973 a = DoGet(ORTHANC, '/dicom-web/series?0020000D=%s' % study)
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	974 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	975 self.assertFalse('00100010' in a[0]) # PatientName
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	976 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	977 self.assertEqual(series, a[0]['0020000E']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	978 self.assertEqual('MR', a[0]['00080060']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	979
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	980 # http://dicom.nema.org/medical/dicom/2019a/output/html/part18.html#table_6.7.1-2b
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	981 a = DoGet(ORTHANC, '/dicom-web/instances?0020000D=%s' % study)
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	982 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	983 self.assertFalse('00100010' in a[0]) # PatientName
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	984 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	985 self.assertEqual(series, a[0]['0020000E']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	986 self.assertEqual('MR', a[0]['00080060']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	987
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	988 a = DoGet(ORTHANC, '/dicom-web/instances?0020000E=%s' % series)
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	989 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	990 self.assertFalse('00080060' in a[0]) # Modality
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	991 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	992 self.assertEqual(series, a[0]['0020000E']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	993 self.assertEqual('BRAINIX', a[0]['00100010']['Value'][0]['Alphabetic'])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	994
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	995 a = DoGet(ORTHANC, '/dicom-web/instances?0020000D=%s&0020000E=%s' % (study, series))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	996 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	997 self.assertFalse('00100010' in a[0]) # PatientName
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	998 self.assertFalse('00080060' in a[0]) # Modality
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	999 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1000 self.assertEqual(series, a[0]['0020000E']['Value'][0])
261 b8cdb0aef4b9 test_bitbucket_issue_164 Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	1001
b8cdb0aef4b9 test_bitbucket_issue_164 Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	1002
270 082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1003 #@unittest.skip("Skip this test on GDCM 2.8.4")
261 b8cdb0aef4b9 test_bitbucket_issue_164 Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	1004 def test_bitbucket_issue_164(self):
270 082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1005 # WARNING - This makes GDCM 2.8.4 crash
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1006 # https://bugs.orthanc-server.com/show_bug.cgi?id=164
261 b8cdb0aef4b9 test_bitbucket_issue_164 Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	1007 UploadInstance(ORTHANC, 'Issue164.dcm')
b8cdb0aef4b9 test_bitbucket_issue_164 Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	1008
b8cdb0aef4b9 test_bitbucket_issue_164 Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	1009 p = DoGetMultipart(ORTHANC, 'dicom-web/studies/1.2.276.0.26.1.1.1.2.2020.45.52293.1506048/series/1.2.276.0.26.1.1.1.2.2020.45.52293.6384450/instances/1.2.276.0.26.1.1.1.2.2020.45.52366.2551599.179568640/frames/5')
b8cdb0aef4b9 test_bitbucket_issue_164 Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	1010 self.assertEqual(1, len(p))
b8cdb0aef4b9 test_bitbucket_issue_164 Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	1011 self.assertEqual(743 * 975 * 3, len(p[0]))
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1012
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1013 if HasGdcmPlugin(ORTHANC):
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1014 self.assertTrue(ComputeMD5(p[0]) in [
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1015 'b952d67da9ff004b0adae3982e89d620', # GDCM >= 3.0
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1016 'b3662c4bfa24a0c73abb08548c63319b' # Fallback to DCMTK
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1017 ])
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1018 else:
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1019 self.assertEqual('b3662c4bfa24a0c73abb08548c63319b', ComputeMD5(p[0])) # DCMTK
270 082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1020
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1021
271 d202bfcd7b96 typo Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1022 def test_bitbucket_issue_168(self):
276 cc10eefaf908 note Sebastien Jodogne <s.jodogne@gmail.com> parents: 275 diff changeset	1023 # "Plugins can't read private tags from the configuration
cc10eefaf908 note Sebastien Jodogne <s.jodogne@gmail.com> parents: 275 diff changeset	1024 # file" This test will fail if DCMTK <= 3.6.1 (e.g. on Ubuntu
cc10eefaf908 note Sebastien Jodogne <s.jodogne@gmail.com> parents: 275 diff changeset	1025 # 16.04), or if Orthanc <= 1.5.8
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1026 # https://bugs.orthanc-server.com/show_bug.cgi?id=168
270 082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1027
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1028 UploadInstance(ORTHANC, 'Issue168.dcm')
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1029
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1030 a = DoGet(ORTHANC, '/dicom-web/studies')
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1031 self.assertEqual(1, len(a))
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1032 self.assertFalse('00090010' in a[0])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1033 self.assertFalse('00091001' in a[0])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1034 self.assertEqual('20170404', a[0]['00080020']['Value'][0])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1035
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1036 a = DoGet(ORTHANC, '/dicom-web/studies?includefield=00091001')
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1037 self.assertEqual(1, len(a))
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1038 self.assertFalse('00090010' in a[0])
325 b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1039 self.assertTrue('00091001' in a[0]) # This fails if DCMTK <= 3.6.1
270 082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1040 self.assertEqual('DS', a[0]['00091001']['vr'])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1041 self.assertEqual(1, len(a[0]['00091001']['Value']))
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1042 self.assertAlmostEqual(98.41, a[0]['00091001']['Value'][0])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1043
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1044 a = DoGet(ORTHANC, '/dicom-web/studies?00090010=Lunit&includefield=00091001')
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1045 self.assertEqual(1, len(a))
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1046 self.assertTrue('00090010' in a[0])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1047 self.assertEqual('LO', a[0]['00090010']['vr'])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1048 self.assertEqual(1, len(a[0]['00090010']['Value']))
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1049 self.assertEqual('Lunit', a[0]['00090010']['Value'][0])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1050 self.assertTrue('00091001' in a[0])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1051 self.assertEqual('DS', a[0]['00091001']['vr'])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1052 self.assertEqual(1, len(a[0]['00091001']['Value']))
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1053 self.assertAlmostEqual(98.41, a[0]['00091001']['Value'][0])
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	1054
270 082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1055 a = DoGet(ORTHANC, '/dicom-web/studies?00090010=Lunit2&includefield=00091001')
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1056 self.assertEqual(0, len(a))
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1057
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1058
272 a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1059 def test_rendered_studies_series(self):
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1060 i = UploadInstance(ORTHANC, 'Phenix/IM-0001-0001.dcm') ['ID']
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1061 study = DoGet(ORTHANC, '/instances/%s/tags?simplify' % i) ['StudyInstanceUID']
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1062 series = DoGet(ORTHANC, '/instances/%s/tags?simplify' % i) ['SeriesInstanceUID']
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1063 instance = DoGet(ORTHANC, '/instances/%s/tags?simplify' % i) ['SOPInstanceUID']
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1064
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1065 a = DoPost(ORTHANC, '/dicom-web/servers/sample/get', {
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1066 'Uri' : '/studies/%s/series/%s/instances/%s/rendered' % (study, series, instance)
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1067 })
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1068
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1069 im = UncompressImage(a)
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1070 self.assertEqual("L", im.mode)
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1071 self.assertEqual(512, im.size[0])
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1072 self.assertEqual(358, im.size[1])
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1073
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1074 b = DoPost(ORTHANC, '/dicom-web/servers/sample/get', {
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1075 'Uri' : '/studies/%s/series/%s/rendered' % (study, series)
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1076 })
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1077
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1078 self.assertEqual(len(a), len(b))
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1079 self.assertEqual(a, b)
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1080
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1081 c = DoPost(ORTHANC, '/dicom-web/servers/sample/get', {
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1082 'Uri' : '/studies/%s/rendered' % study
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1083 })
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1084
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1085 self.assertEqual(len(a), len(c))
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1086 self.assertEqual(a, c)
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1087
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1088
273 afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1089 def test_multiple_mime_accept_wado_rs(self):
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1090 # "Multiple MIME type Accept Headers for Wado-RS"
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1091 # https://groups.google.com/forum/#!msg/orthanc-users/P3B6J9abZpE/syn5dnW2AwAJ
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1092
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1093 UploadInstance(ORTHANC, 'DummyCT.dcm')
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1094 study = '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390'
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1095
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1096 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study)))
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1097
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1098 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study,
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1099 headers = { 'Accept' : 'application/json, application/dicom+json' })))
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1100
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1101 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study,
274 6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1102 headers = { 'Accept' : 'application/json' })))
6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1103
6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1104 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study,
6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1105 headers = { 'Accept' : 'application/dicom+json' })))
6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1106
6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1107 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study,
273 afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1108 headers = { 'Accept' : 'toto, application/dicom+json' })))
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1109
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1110 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study,
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1111 headers = { 'Accept' : 'application/json, tata' })))
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1112
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1113 self.assertRaises(Exception, lambda: DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study,
274 6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1114 headers = { 'Accept' : 'toto' }))
6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1115
6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1116 self.assertRaises(Exception, lambda: DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study,
273 afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1117 headers = { 'Accept' : 'toto, tata' }))
275 264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1118
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1119 # https://groups.google.com/d/msg/orthanc-users/9o5kItsMQI0/Og6B27YyBgAJ
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1120 self.assertEqual(1, len(DoGetMultipart(ORTHANC, '/dicom-web/studies/%s/metadata' % study,
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1121 headers = { 'Accept' : 'multipart/related;type=application/dicom+xml' })))
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1122
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1123 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study,
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1124 headers = { 'Accept' : 'application/json, application/dicom+xml' })))
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1125
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1126 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study,
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1127 headers = { 'Accept' : 'application/dicom+xml, application/json' })))
284 7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1128
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1129
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1130
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1131 def test_bitbucket_issue_56(self):
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1132 # "Case-insensitive matching over accents" => DICOMweb part
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1133 # from AlexanderM on 2020-03-20
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	1134 # https://bugs.orthanc-server.com/show_bug.cgi?id=56
284 7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1135 UploadInstance(ORTHANC, 'Issue56-NoPixelData.dcm')
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1136
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1137 self.assertEqual(1, len(DoPost(ORTHANC, '/tools/find', {
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1138 'Level' : 'Patient',
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1139 'Query' : {
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1140 'PatientName' : 'Гусева*',
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1141 },
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1142 })))
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1143
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1144 self.assertEqual(1, len(DoPost(ORTHANC, '/tools/find', {
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1145 'Level' : 'Patient',
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1146 'Query' : {
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1147 'PatientName' : 'гусева*',
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1148 },
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1149 })))
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1150
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1151 self.assertEqual(1, len(DoGet(ORTHANC, u'/dicom-web/studies?PatientName=Гусева*',
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1152 headers = { 'accept' : 'application/json' })))
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1153
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1154 # This line is the issue
284 7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1155 self.assertEqual(1, len(DoGet(ORTHANC, u'/dicom-web/studies?PatientName=гусева*',
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1156 headers = { 'accept' : 'application/json' })))
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1157
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1158
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1159 def test_frames_transcoding(self):
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1160 ACCEPT = {
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1161 '1.2.840.10008.1.2' : 'multipart/related; type=application/octet-stream; transfer-syntax=1.2.840.10008.1.2',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1162 '1.2.840.10008.1.2.1' : 'multipart/related; type=application/octet-stream; transfer-syntax=1.2.840.10008.1.2.1',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1163 '1.2.840.10008.1.2.4.50' : 'multipart/related; type=image/jpeg; transfer-syntax=1.2.840.10008.1.2.4.50',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1164 '1.2.840.10008.1.2.4.51' : 'multipart/related; type=image/jpeg; transfer-syntax=1.2.840.10008.1.2.4.51',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1165 '1.2.840.10008.1.2.4.57' : 'multipart/related; type=image/jpeg; transfer-syntax=1.2.840.10008.1.2.4.57',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1166 '1.2.840.10008.1.2.4.70' : 'multipart/related; type=image/jpeg; transfer-syntax=1.2.840.10008.1.2.4.70',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1167 }
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1168
321 3c8c6b41eec4 dealing with Content-Location in test_frames_transcoding of DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1169 uri = 'dicom-web%s' % UploadAndGetWadoPath('TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm')
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1170 truth = Image.open(GetDatabasePath('TransferSyntaxes/1.2.840.10008.1.2.4.50.png'))
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1171
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1172 a = DoGetMultipart(ORTHANC, '%s/frames/1' % uri,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1173 headers = { 'Accept' : ACCEPT['1.2.840.10008.1.2.4.50'] },
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1174 returnHeaders = True)
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1175 self.assertEqual(1, len(a))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1176 self.assertEqual(2, len(a[0]))
321 3c8c6b41eec4 dealing with Content-Location in test_frames_transcoding of DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1177 self.assertEqual('%s%s/frames/1' % (ORTHANC['Url'], uri),
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1178 a[0][1]['Content-Location'])
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1179 self.assertEqual(ACCEPT['1.2.840.10008.1.2.4.50'],
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1180 'multipart/related; type=%s' % a[0][1]['Content-Type'])
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1181 self.assertEqual(53476, len(a[0][0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1182 self.assertEqual('142fdb8a1dc2aa7e6b8952aa294a6e22', ComputeMD5(a[0][0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1183
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1184 a = DoGetMultipart(ORTHANC, '%s/frames/1' % uri)
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1185 self.assertEqual(1, len(a))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1186 self.assertEqual(480 * 640 * 3, len(a[0]))
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1187
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1188 # http://effbot.org/zone/pil-comparing-images.htm
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1189 img = Image.frombytes('RGB', [ 640, 480 ], a[0])
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1190 self.assertLessEqual(GetMaxImageDifference(img, truth), 2)
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1191
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1192 ACCEPT2 = copy.deepcopy(ACCEPT)
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1193 if HasGdcmPlugin(ORTHANC):
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1194 IS_GDCM = True
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1195 ACCEPT2['1.2.840.10008.1.2.1'] = 'multipart/related; type=application/octet-stream'
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1196 del ACCEPT2['1.2.840.10008.1.2']
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1197 else:
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1198 self.assertEqual('dfdc79f5070926bbb8ac079ee91f5b91', ComputeMD5(a[0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1199 IS_GDCM = False
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1200
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1201 a = DoGetMultipart(ORTHANC, '%s/frames/1' % uri,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1202 headers = { 'Accept' : ACCEPT2['1.2.840.10008.1.2.1'] })
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1203 self.assertEqual(1, len(a))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1204 self.assertEqual(480 * 640 * 3, len(a[0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1205
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1206 img = Image.frombytes('RGB', [ 640, 480 ], a[0])
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1207 self.assertLessEqual(GetMaxImageDifference(img, truth), 2)
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1208
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1209 if not IS_GDCM:
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1210 self.assertEqual('dfdc79f5070926bbb8ac079ee91f5b91', ComputeMD5(a[0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1211
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1212
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1213 # Test download using the same transfer syntax
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1214 RESULTS = {
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1215 '1.2.840.10008.1.2' : 'f54c7ea520ab3ec32b6303581ecd262f',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1216 '1.2.840.10008.1.2.1' : '4b350b9353a93c747917c7c3bf9b8f44',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1217 '1.2.840.10008.1.2.4.50' : '142fdb8a1dc2aa7e6b8952aa294a6e22',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1218 '1.2.840.10008.1.2.4.51' : '8b37945d75f9d2899ed868bdba429a0d',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1219 '1.2.840.10008.1.2.4.57' : '75c84823eddb560d127b1d24c9406f30',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1220 '1.2.840.10008.1.2.4.70' : '2c35726328f0200396e583a0038b0269',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1221 }
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1222
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1223 if IS_GDCM:
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1224 # This file was failing with GDCM, as it has 2 fragments,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1225 # and only the first one was returned => the MD5 below is BAD
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1226 #RESULTS['1.2.840.10008.1.2.4.51'] = '901963a322a817946b074f9ed0afa060'
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1227 pass
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1228
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1229 for syntax in ACCEPT2:
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1230 uri = '/dicom-web%s' % UploadAndGetWadoPath('TransferSyntaxes/%s.dcm' % syntax)
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1231 a = DoGetMultipart(ORTHANC, '%s/frames/1' % uri,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1232 headers = { 'Accept' : ACCEPT2[syntax] })
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1233 self.assertEqual(1, len(a))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1234 self.assertEqual(RESULTS[syntax], ComputeMD5(a[0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1235
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1236 # Test transcoding to all the possible transfer syntaxes
321 3c8c6b41eec4 dealing with Content-Location in test_frames_transcoding of DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1237 uri = 'dicom-web%s' % UploadAndGetWadoPath('KarstenHilbertRF.dcm')
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1238 for syntax in ACCEPT2:
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1239 a = DoGetMultipart(ORTHANC, '%s/frames/1' % uri,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1240 headers = { 'Accept' : ACCEPT2[syntax] },
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1241 returnHeaders = True)
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1242 self.assertEqual(1, len(a))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1243 self.assertEqual(2, len(a[0]))
321 3c8c6b41eec4 dealing with Content-Location in test_frames_transcoding of DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1244 self.assertEqual('%s%s/frames/1' % (ORTHANC['Url'], uri),
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1245 a[0][1]['Content-Location'])
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1246 self.assertEqual(ACCEPT[syntax],
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1247 'multipart/related; type=%s' % a[0][1]['Content-Type'])
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1248 if IS_GDCM:
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1249 self.assertEqual({
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1250 '1.2.840.10008.1.2' : '1c8cebde0c74450ce4dfb75dd52ddad7',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1251 '1.2.840.10008.1.2.1' : '1c8cebde0c74450ce4dfb75dd52ddad7',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1252 '1.2.840.10008.1.2.4.50' : 'f4d145e5f33fbd39375ce0f91453d6cc',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1253 '1.2.840.10008.1.2.4.51' : 'f4d145e5f33fbd39375ce0f91453d6cc',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1254 '1.2.840.10008.1.2.4.57' : 'dc55800ce1a8ac556c266cdb26d75757',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1255 '1.2.840.10008.1.2.4.70' : 'dc55800ce1a8ac556c266cdb26d75757',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1256 } [syntax], ComputeMD5(a[0][0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1257 else:
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1258 self.assertEqual({
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1259 '1.2.840.10008.1.2' : '1c8cebde0c74450ce4dfb75dd52ddad7',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1260 '1.2.840.10008.1.2.1' : '1c8cebde0c74450ce4dfb75dd52ddad7',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1261 '1.2.840.10008.1.2.4.50' : '0a0ab74fe7c68529bdd416fc9e5e742a',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1262 '1.2.840.10008.1.2.4.51' : '33d1ab2fe169c5b5ba932a9bbc3c6306',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1263 '1.2.840.10008.1.2.4.57' : '3d21c969da846ca41e0498a0dcfad061',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1264 '1.2.840.10008.1.2.4.70' : '49d5353c8673208629847ad45a855557',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1265 } [syntax], ComputeMD5(a[0][0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1266
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1267
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1268 # JPEG image with many fragments for 2 frames
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1269 uri = '/dicom-web%s' % UploadAndGetWadoPath('LenaTwiceWithFragments.dcm')
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1270
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1271 a = DoGetMultipart(ORTHANC, '%s/frames/1' % uri,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1272 headers = { 'Accept' : ACCEPT['1.2.840.10008.1.2.4.50'] })
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1273 self.assertEqual(1, len(a))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1274 self.assertEqual(69214, len(a[0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1275 self.assertEqual('0eaf36d4881c513ca70b6684bfaa5b08', ComputeMD5(a[0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1276
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1277 b = DoGetMultipart(ORTHANC, '%s/frames/2' % uri,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1278 headers = { 'Accept' : ACCEPT['1.2.840.10008.1.2.4.50'] })
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1279 self.assertEqual(1, len(b))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1280 self.assertEqual(a[0], b[0])
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1281
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1282 b = DoGetMultipart(ORTHANC, '%s/frames/1,2' % uri,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1283 headers = { 'Accept' : ACCEPT['1.2.840.10008.1.2.4.50'] })
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1284 self.assertEqual(2, len(b))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1285 self.assertEqual(a[0], b[0])
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1286 self.assertEqual(a[0], b[1])
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1287
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1288
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1289 def test_wado_transcoding(self):
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1290 uri = '/dicom-web%s' % UploadAndGetWadoPath('TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm')
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1291
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1292 self.assertRaises(Exception, lambda: DoGetMultipart(ORTHANC, '%s' % uri,
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1293 headers = { 'Accept' : 'nope' }))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1294
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1295 a = DoGetMultipart(ORTHANC, '%s' % uri,
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1296 headers = { })
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1297 self.assertEqual(1, len(a))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1298 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(a[0]))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1299 s = len(a[0])
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1300
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1301 a = DoGetMultipart(ORTHANC, '%s' % uri,
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1302 headers = { 'Accept' : 'multipart/related' })
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1303 self.assertEqual(1, len(a))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1304 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(a[0]))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1305
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1306 a = DoGetMultipart(ORTHANC, '%s' % uri,
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1307 headers = { 'Accept' : 'multipart/related; type=application/dicom' })
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1308 self.assertEqual(1, len(a))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1309 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(a[0]))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1310
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1311 a = DoGetMultipart(ORTHANC, '%s' % uri,
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1312 headers = { 'Accept' : 'multipart/related; type=application/dicom; transfer-syntax=*' })
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1313 self.assertEqual(1, len(a))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1314 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(a[0]))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1315 self.assertEqual(s, len(a[0]))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1316
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1317 a = DoGetMultipart(ORTHANC, '%s' % uri,
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1318 headers = { 'Accept' : 'multipart/related; type=application/dicom; transfer-syntax=1.2.840.10008.1.2.4.50' })
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1319 self.assertEqual(1, len(a))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1320 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(a[0]))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1321
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1322 a = DoGetMultipart(ORTHANC, '%s' % uri,
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1323 headers = { 'Accept' : 'multipart/related; type=application/dicom; transfer-syntax=1.2.840.10008.1.2.1' })
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1324 self.assertEqual(1, len(a))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1325 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(a[0]))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1326 self.assertTrue(10 * s < len(a[0]))
325 b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1327
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1328
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1329 def test_compare_wado_uri_and_rs(self):
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1330 # https://groups.google.com/d/msg/orthanc-users/mKgr2QAKTCU/R7u4I1LvBAAJ
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1331
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1332 # Image "2020-08-12-Christopher.dcm" corresponds to the result of:
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1333 # $ gdcmconv --raw 1.2.840.113704.9.1000.16.2.20190613104005642000100010001.dcm 2020-08-12-Christopher.dcm
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1334 # Image "2020-08-12-Christopher.png" corresponds to "2.png"
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1335
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1336 i = UploadInstance(ORTHANC, '2020-08-12-Christopher.dcm') ['ID']
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1337 STUDY = '1.2.840.113704.9.1000.16.0.20190613103939444'
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1338 SERIES = '1.2.840.113704.9.1000.16.1.2019061310394289000010001'
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1339 INSTANCE = '1.2.840.113704.9.1000.16.2.20190613104005642000100010001'
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1340
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1341 with open(GetDatabasePath('2020-08-12-Christopher.png'), 'rb') as f:
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1342 truth = UncompressImage(f.read())
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1343
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1344 im1 = GetImage(ORTHANC, args.wado + '?requestType=WADO&objectUID=%s&contentType=image/jpg' % INSTANCE)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1345 self.assertEqual('JPEG', im1.format)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1346
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1347 im2 = GetImage(ORTHANC, args.wado + '?requestType=WADO&objectUID=%s&contentType=image/png' % INSTANCE)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1348 self.assertEqual('PNG', im2.format)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1349
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1350 im3 = GetImage(ORTHANC, '/dicom-web/studies/%s/series/%s/instances/%s/frames/1/rendered' % (STUDY, SERIES, INSTANCE))
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1351 self.assertEqual('JPEG', im3.format)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1352
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1353 im4 = GetImage(ORTHANC, '/dicom-web/studies/%s/series/%s/instances/%s/rendered' % (STUDY, SERIES, INSTANCE),
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1354 headers = { 'Accept' : 'image/png' })
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1355 self.assertEqual('PNG', im4.format)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1356
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1357 im5 = GetImage(ORTHANC, '/instances/%s/rendered' % i, { 'Accept' : 'image/jpeg' })
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1358 self.assertEqual('JPEG', im5.format)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1359
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1360 im6 = GetImage(ORTHANC, '/instances/%s/rendered' % i)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1361 self.assertEqual('PNG', im6.format)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1362
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1363 for im in [ truth, im1, im2, im3, im4, im5, im6 ]:
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1364 self.assertEqual('L', im.mode)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1365 self.assertEqual(512, im.size[0])
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1366 self.assertEqual(512, im.size[1])
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1367
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1368 im2.save('/tmp/a.png')
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1369 im4.save('/tmp/b.png')
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1370 im6.save('/tmp/c.png')
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1371
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1372 # The following fails in DICOMweb plugin <= 1.2, as "/rendered"
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1373 # was redirecting to the "/preview" route of Orthanc
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1374 # http://effbot.org/zone/pil-comparing-images.htm
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1375 self.assertTrue(ImageChops.difference(im1, im3).getbbox() is None)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1376 self.assertTrue(ImageChops.difference(im1, im5).getbbox() is None)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1377 self.assertTrue(ImageChops.difference(im2, im4).getbbox() is None)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1378 self.assertTrue(ImageChops.difference(im2, im6).getbbox() is None)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1379 self.assertTrue(ImageChops.difference(im3, im5).getbbox() is None)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1380 self.assertTrue(ImageChops.difference(im4, im6).getbbox() is None)
345 4d3b797aa5ae fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 325 diff changeset	1381
4d3b797aa5ae fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 325 diff changeset	1382 bbox = ImageChops.difference(im2, truth).getbbox()
346 a56cbcbacfde fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 345 diff changeset	1383 if bbox != None:
a56cbcbacfde fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 345 diff changeset	1384 # Tolerance of just 1 pixel of difference (needed on Windows)
a56cbcbacfde fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 345 diff changeset	1385 #print(im2.getpixel((238,275))) # => 255
a56cbcbacfde fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 345 diff changeset	1386 #print(truth.getpixel((238,275))) # => 254
a56cbcbacfde fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 345 diff changeset	1387 self.assertLessEqual(abs(bbox[2] - bbox[0]), 1)
a56cbcbacfde fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 345 diff changeset	1388 self.assertLessEqual(abs(bbox[3] - bbox[1]), 1)
325 b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1389
273 afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1390
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1391 try:
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1392 print('\nStarting the tests...')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1393 unittest.main(argv = [ sys.argv[0] ] + args.options)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1394
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1395 finally:
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1396 print('\nDone')

Mercurial > hg > orthanc-tests

annotate Plugins/DicomWeb/Run.py @ 363:79ce0f7a9714