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

annotate Plugins/DicomWeb/Run.py @ 608:ba06331ac8dd

author	Alain Mazy <am@osimis.io>
date	Wed, 24 Jan 2024 13:23:29 +0100
parents	8aa101e126d0
children	9f8276ac1cdd

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
511 933fe1bbce4f upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 510 diff changeset	8 # Copyright (C) 2017-2023 Osimis S.A., Belgium
933fe1bbce4f upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 510 diff changeset	9 # Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 #
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 # 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	12 # 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	13 # 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	14 # License, or (at your option) any later version.
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 #
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 # 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	17 # WITHOUT ANY WARRANTY; without even the implied warranty of
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 # General Public License for more details.
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 #
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 # 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	22 # 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	23
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24
85 96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	25
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	26 # You must add the following to the configuration file:
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	27 #
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	28 # "DicomWeb" : {
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	29 # "Servers" : {
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	30 # "sample" : [ "http://localhost:8042/dicom-web/", "alice", "orthanctest" ]
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
96a4cce190dc note Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	35
558 0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	36 import argparse
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	37 import copy
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 import os
33 eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	39 import pprint
559 87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	40 import pydicom
558 0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	41 import re
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42 import sys
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 import unittest
558 0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	44 import xml.dom.minidom
575 28fef24147fa test for new DicomWeb cache Alain Mazy <am@osimis.io> parents: 563 diff changeset	45 import time
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	46 from PIL import ImageChops
563 be69d6d8260c fix for python2 Alain Mazy <am@osimis.io> parents: 562 diff changeset	47 from io import BytesIO
33 eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	48 from DicomWeb import *
32 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 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	51 from Toolbox import *
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 ##
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 ## Parse the command-line arguments
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 ##
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 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	59
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 parser.add_argument('--server',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	61 default = 'localhost',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 help = 'Address of the Orthanc server to test')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 parser.add_argument('--rest',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 type = int,
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 default = 8042,
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66 help = 'Port to the REST API')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 parser.add_argument('--username',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 default = 'alice',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 help = 'Username to the REST API')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 parser.add_argument('--password',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 default = 'orthanctest',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72 help = 'Password to the REST API')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 parser.add_argument('--wado',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 default = '/wado',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75 help = 'Path to the WADO API')
33 eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	76 parser.add_argument('--dicomweb',
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 default = '/dicom-web/',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78 help = 'Path to the DICOMweb API')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79 parser.add_argument('--force', help = 'Do not warn the user',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 action = 'store_true')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 parser.add_argument('options', metavar = 'N', nargs = '*',
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82 help='Arguments to Python unittest')
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 args = parser.parse_args()
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 ##
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88 ## Configure the testing context
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89 ##
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 if not args.force:
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 print("""
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 WARNING: This test will remove all the content of your
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94 Orthanc instance running on %s!
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96 Are you sure ["yes" to go on]?""" % args.server)
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 if sys.stdin.readline().strip() != 'yes':
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99 print('Aborting...')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	100 exit(0)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	103 ORTHANC = DefineOrthanc(server = args.server,
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	104 username = args.username,
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	105 password = args.password,
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	106 restPort = args.rest)
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
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109 ##
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110 ## The tests
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	111 ##
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	112
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	113
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	114 def UploadAndGetWadoPath(dicom):
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	115 i = UploadInstance(ORTHANC, dicom) ['ID']
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	116 study = DoGet(ORTHANC, '/instances/%s/tags?simplify' % i) ['StudyInstanceUID']
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	117 series = DoGet(ORTHANC, '/instances/%s/tags?simplify' % i) ['SeriesInstanceUID']
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	118 instance = DoGet(ORTHANC, '/instances/%s/tags?simplify' % i) ['SOPInstanceUID']
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	119 return '/studies/%s/series/%s/instances/%s' % (study, series, instance)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	120
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	121
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	122
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123 class Orthanc(unittest.TestCase):
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	124 def setUp(self):
83 3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	125 if (sys.version_info >= (3, 0)):
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	126 # Remove annoying warnings about unclosed socket in Python 3
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	127 import warnings
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	128 warnings.simplefilter("ignore", ResourceWarning)
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	129
270 082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	130 #print("In test: ", self._testMethodName)
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	131
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	132 DropOrthanc(ORTHANC)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134 def test_wado_dicom(self):
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 UploadInstance(ORTHANC, 'Brainix/Flair/IM-0001-0001.dcm')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137 SIZE = 169478
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 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	139 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	140 STUDY = '2.16.840.1.113669.632.20.1211.10000357775'
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 self.assertRaises(Exception, lambda: DoGet(ORTHANC, args.wado))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 self.assertRaises(Exception, lambda: DoGet(ORTHANC, args.wado + '?requestType=WADO'))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144 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	145
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 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	147 self.assertEqual(SIZE, len(dicom))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149 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	150 self.assertEqual(SIZE, len(dicom))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152 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	153 self.assertEqual(SIZE, len(dicom))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155 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	156 self.assertEqual(SIZE, len(dicom))
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 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	159 self.assertEqual(SIZE, len(dicom))
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 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	162 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	163 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	164
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	165 def test_wado_image(self):
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166 UploadInstance(ORTHANC, 'Phenix/IM-0001-0001.dcm')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167 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	168
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169 im = GetImage(ORTHANC, args.wado + '?requestType=WADO&objectUID=%s' % INSTANCE)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	170 self.assertEqual('JPEG', im.format)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 self.assertEqual('L', im.mode)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	172 self.assertEqual(512, im.size[0])
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173 self.assertEqual(358, im.size[1])
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175 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	176 self.assertEqual('JPEG', im.format)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178 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	179 self.assertEqual('PNG', im.format)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	180 self.assertEqual('L', im.mode)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	181 self.assertEqual(512, im.size[0])
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	182 self.assertEqual(358, im.size[1])
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	183
33 eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	184 def test_stow(self):
eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	185 self.assertEqual(0, len(DoGet(ORTHANC, '/instances')))
eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	186 SendStow(ORTHANC, args.dicomweb + '/studies', GetDatabasePath('Phenix/IM-0001-0001.dcm'))
eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	187 self.assertEqual(1, len(DoGet(ORTHANC, '/instances')))
eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	188 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	189 self.assertEqual(1, len(DoGet(ORTHANC, '/instances')))
eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	190
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	191 self.assertEqual(4, len(a))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	192
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	193 # Specific character set
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	194 self.assertTrue('00080005' in a)
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	195 self.assertEqual('CS', a['00080005']['vr'])
33 eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	196
eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	197 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	198 self.assertEqual('UR', a['00081190']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	199
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	200 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	201 self.assertEqual('SQ', a['00081198']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	202
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	203 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	204 self.assertEqual('SQ', a['00081199']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	205
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	206 b = a['00081199']['Value'][0]
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	207
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	208 # Referenced SOP class UID
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	209 self.assertEqual('UI', b['00081150']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	210 self.assertEqual(1, len(b['00081150']['Value']))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	211 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	212
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	213 # Referenced SOP instance UID
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	214 self.assertEqual('UI', b['00081155']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	215 self.assertEqual(1, len(b['00081155']['Value']))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	216 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	217
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	218 # Retrieve URL
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	219 self.assertEqual('UR', b['00081190']['vr'])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	220 self.assertEqual(1, len(b['00081190']['Value']))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	221 self.assertTrue(b['00081190']['Value'][0].
33 eb6d219af210 test stow Sebastien Jodogne <s.jodogne@gmail.com> parents: 32 diff changeset	222 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	223
83 3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	224 # Remove the "http://localhost:8042" prefix
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	225 url = a['00081190']['Value'][0]
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	226 url = re.sub(r'(http\|https)://[^/]+(/.*)', r'\2', url)
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	227
367 9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	228 # Get the content-length of all the multiparts of this WADO-RS
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	229 # request (prevent transcoding by setting transfer-syntax to
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	230 # "*", necessary since release 1.5 of the DICOMweb plugin)
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	231 b = DoGet(ORTHANC, url, headers = {
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	232 'Accept' : 'multipart/related;type=application/dicom;transfer-syntax=*'
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	233 }).decode('utf-8', 'ignore')
83 3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	234 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	235 self.assertEqual(1, len(parts))
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 73 diff changeset	236 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	237
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	238
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	239 def test_server_get(self):
277 95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	240 try:
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	241 DoDelete(ORTHANC, '/dicom-web/servers/google') # If "AllWindowsStart.sh" is used
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	242 except:
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	243 pass
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	244
388 3ef44d201875 revert incorrect changeset 386 Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	245 try:
3ef44d201875 revert incorrect changeset 386 Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	246 DoDelete(ORTHANC, '/dicom-web/servers/hello') # If "test_add_server" fails
3ef44d201875 revert incorrect changeset 386 Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	247 except:
3ef44d201875 revert incorrect changeset 386 Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	248 pass
3ef44d201875 revert incorrect changeset 386 Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	249
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	250 UploadInstance(ORTHANC, 'Knee/T1/IM-0001-0001.dcm')
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	251
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	252 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/servers')))
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	253 self.assertTrue('sample' in DoGet(ORTHANC, '/dicom-web/servers'))
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	254
129 53d522dd4a38 added tests for ?expand in /dicom-web/servers route amazy parents: 114 diff changeset	255 serversReadback = DoGet(ORTHANC, '/dicom-web/servers?expand')
53d522dd4a38 added tests for ?expand in /dicom-web/servers route amazy parents: 114 diff changeset	256 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	257 self.assertEqual('alice', serversReadback['sample']['Username'])
53d522dd4a38 added tests for ?expand in /dicom-web/servers route amazy parents: 114 diff changeset	258
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	259 sample = DoGet(ORTHANC, '/dicom-web/servers/sample')
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	260 self.assertEqual(5, len(sample))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	261 self.assertTrue('stow' in sample)
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	262 self.assertTrue('retrieve' in sample)
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	263 self.assertTrue('get' in sample)
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	264 self.assertTrue('wado' in sample) # New in 0.7
49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	265 self.assertTrue('qido' in sample) # New in 0.7
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	266
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	267 # application/dicom+xml
131 90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	268 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	269 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	270 re.MULTILINE)))
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	271 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	272 (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	273 { 'Uri' : '/studies',
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	274 '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	275 }), re.MULTILINE)))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	276
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	277 # application/dicom+json
131 90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	278 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	279 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	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 '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	283
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	284 # application/json
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	285 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	286 headers = { 'Accept' : 'application/json' })))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	287 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	288 { 'Uri' : '/studies',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	289 'HttpHeaders' : { 'Accept' : 'application/json' }})))
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	290
131 90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	291 # 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	292 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	293 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	294 { 'Uri' : '/studies' })))
90e5331ddee9 application/dicom+json is now the default in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	295
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	296
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	297 def test_server_stow(self):
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	298 UploadInstance(ORTHANC, 'Knee/T1/IM-0001-0001.dcm')
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	299
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	300 self.assertRaises(Exception, lambda:
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	301 DoPost(ORTHANC, '/dicom-web/servers/sample/stow',
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	302 { 'Resources' : [ 'nope' ],
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	303 'Synchronous' : True })) # inexisting resource
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	304
499 9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	305 l = 3 # For >= 1.10.1
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	306
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	307 # study
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	308 r = DoPost(ORTHANC, '/dicom-web/servers/sample/stow',
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	309 { 'Resources' : [ '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918' ],
499 9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	310 'Synchronous' : True })
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	311
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	312 self.assertEqual(l, len(r))
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	313 self.assertEqual("0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918", r['Resources']['Studies'][0])
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	314
499 9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	315 # series
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	316 r = DoPost(ORTHANC, '/dicom-web/servers/sample/stow',
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	317 { 'Resources' : [ '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285' ],
499 9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	318 'Synchronous' : True })
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	319 self.assertEqual(l, len(r))
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	320 self.assertEqual("6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285", r['Resources']['Series'][0])
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	321
499 9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	322 # instances
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	323 r = DoPost(ORTHANC, '/dicom-web/servers/sample/stow',
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	324 { 'Resources' : [ 'c8df6478-d7794217-0f11c293-a41237c9-31d98357' ],
499 9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	325 'Synchronous' : True })
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	326 self.assertEqual(l, len(r))
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	327 self.assertEqual("c8df6478-d7794217-0f11c293-a41237c9-31d98357", r['Resources']['Instances'][0])
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	328
499 9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	329 # altogether
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	330 r = DoPost(ORTHANC, '/dicom-web/servers/sample/stow',
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	331 { 'Resources' : [
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	332 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	333 '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	334 '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285',
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	335 'c8df6478-d7794217-0f11c293-a41237c9-31d98357' ],
499 9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	336 'Synchronous' : True })
510 fb900401be28 fix Alain Mazy <am@osimis.io> parents: 499 diff changeset	337 # pprint.pprint(r)
499 9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	338 self.assertEqual(l, len(r))
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	339 self.assertEqual("ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17", r['Resources']['Patients'][0])
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	340 self.assertEqual("0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918", r['Resources']['Studies'][0])
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	341 self.assertEqual("6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285", r['Resources']['Series'][0])
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	342 self.assertEqual("c8df6478-d7794217-0f11c293-a41237c9-31d98357", r['Resources']['Instances'][0])
9a6fa1ffb23a tests for DicomWeb 1.10.1 Alain Mazy <am@osimis.io> parents: 487 diff changeset	343
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	344
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	345
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	346 def test_server_retrieve(self):
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	347 COUNT = 'ReceivedInstancesCount'
49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	348 #COUNT = 'Instances' # In version <= 0.6
49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	349
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	350 UploadInstance(ORTHANC, 'Knee/T1/IM-0001-0001.dcm')
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	351 UploadInstance(ORTHANC, 'Knee/T1/IM-0001-0002.dcm')
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	352 UploadInstance(ORTHANC, 'Knee/T2/IM-0001-0001.dcm')
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 self.assertRaises(Exception, lambda:
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	355 DoPost(ORTHANC, '/dicom-web/servers/sample/retrieve',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	356 { 'Resources' : [ { 'Study' : 'nope' } ]})) # inexisting resource
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	357
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	358 t = DoPost(ORTHANC, '/dicom-web/servers/sample/retrieve',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	359 { 'Resources' : [ { 'Study' : '2.16.840.1.113669.632.20.121711.10000160881' } ] })
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	360 self.assertEqual(3, int(t[COUNT]))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	361
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	362 # Missing "Study" field
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	363 self.assertRaises(Exception, lambda:
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	364 DoPost(ORTHANC, '/dicom-web/servers/sample/retrieve',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	365 { '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	366
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	367 t = DoPost(ORTHANC, '/dicom-web/servers/sample/retrieve',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	368 { '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	369 'Series' : '1.3.46.670589.11.17521.5.0.3124.2008081908564160709' } ] })
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	370 self.assertEqual(2, int(t[COUNT]))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	371
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	372 t = DoPost(ORTHANC, '/dicom-web/servers/sample/retrieve',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	373 { '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	374 'Series' : '1.3.46.670589.11.17521.5.0.3124.2008081909090037350' } ] })
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	375 self.assertEqual(1, int(t[COUNT]))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	376
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	377 t = DoPost(ORTHANC, '/dicom-web/servers/sample/retrieve',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	378 { '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	379 '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	380 { 'Study' : '2.16.840.1.113669.632.20.121711.10000160881',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	381 'Series' : '1.3.46.670589.11.17521.5.0.3124.2008081908564160709' } ] })
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	382 self.assertEqual(3, int(t[COUNT]))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	383
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	384 t = DoPost(ORTHANC, '/dicom-web/servers/sample/retrieve',
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	385 { '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	386 '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	387 'Instance' : '1.3.46.670589.11.17521.5.0.3124.2008081909113806560' } ] })
244 49cf8ed97a28 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 242 diff changeset	388 self.assertEqual(1, int(t[COUNT]))
84 dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	389
dc90b87471a8 tests for dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	390
114 a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	391 def test_bitbucket_issue_53(self):
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	392 # DICOMWeb plugin support for "limit" and "offset" parameters in QIDO-RS
588 8aa101e126d0 migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 586 diff changeset	393 # https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=53
114 a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	394
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	395 UploadInstance(ORTHANC, 'Brainix/Flair/IM-0001-0001.dcm')
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	396 UploadInstance(ORTHANC, 'Knee/T1/IM-0001-0001.dcm')
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	397
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	398 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	399 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	400
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	401 a = DoGet(ORTHANC, '/dicom-web/studies',
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	402 headers = { 'accept' : 'application/json' })
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	403 self.assertEqual(2, len(a))
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	404
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	405 b = []
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	406 a = DoGet(ORTHANC, '/dicom-web/studies?limit=1',
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	407 headers = { 'accept' : 'application/json' })
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	408 self.assertEqual(1, len(a))
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	409 b.append(a[0]['0020000D']['Value'][0])
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	410
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	411 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	412 headers = { 'accept' : 'application/json' })
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	413 self.assertEqual(1, len(a))
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	414 b.append(a[0]['0020000D']['Value'][0])
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	415
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	416 self.assertTrue(brainix in b)
a6019560272f test_bitbucket_issue_53 Sebastien Jodogne <s.jodogne@gmail.com> parents: 100 diff changeset	417 self.assertTrue(knee in b)
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	418
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	419
184 e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	420 def test_bitbucket_issue_111(self):
223 f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	421 # Wrong serialization of empty values
588 8aa101e126d0 migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 586 diff changeset	422 # https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=111
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	423 # 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	424
184 e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	425 # According to the standard, section F.2.5
e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	426 # (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	427 # 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	428 # 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	429 # preserved in the DICOM JSON attribute object containing no
e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	430 # "Value", "BulkDataURI" or "InlineBinary".
588 8aa101e126d0 migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 586 diff changeset	431 # https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=111
184 e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	432
223 f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	433 UploadInstance(ORTHANC, 'Issue111.dcm')
184 e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	434
223 f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	435 # Test WADO-RS
f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	436 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	437 self.assertEqual(1, len(a))
f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	438 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	439 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	440 self.assertEqual('SH', a[0]['00080050']['vr'])
184 e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	441
223 f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	442 # Test QIDO-RS
f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	443 a = DoGet(ORTHANC, '/dicom-web/studies')
184 e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	444 self.assertEqual(1, len(a))
e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	445 self.assertTrue('00080050' in a[0]) # AccessionNumber is null
e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	446 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	447 self.assertEqual('SH', a[0]['00080050']['vr'])
e244312964d6 test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	448
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	449
537 23d577e9a32f doc Alain Mazy <am@osimis.io> parents: 533 diff changeset	450 # this test fails if SeriesMetadata = "MainDicomTags" (this is expected since the reference json is the full json)
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	451 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	452 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	453 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	454 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	455 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	456 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	457 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	458
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	459 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	460 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	461 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	462 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	463
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	464 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	465 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	466 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	467
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	468 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	469 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	470 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	471
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	472 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	473 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	474 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	475 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	476 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	477 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	478
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	479
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	480 def test_wado_pixel_data(self):
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	481 orthanc = UploadInstance(ORTHANC, 'Issue29.dcm') ['ID']
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	482 a = DoGet(ORTHANC, '/dicom-web/instances')
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	483 self.assertEqual(1, len(a))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	484 url = a[0]['00081190']['Value'][0]
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	485
278 514785dacd6d fix dicomweb tests with debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 277 diff changeset	486 prefix = 'http://%s:%s' % (args.server, args.rest)
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	487 self.assertTrue(url.startswith(prefix))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	488
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	489 b = DoGet(ORTHANC, url[len(prefix):] + '/metadata')
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	490 self.assertEqual('OB', b[0]['7FE00010']['vr'])
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	491 self.assertEqual(2, len(b[0]['7FE00010']))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	492 self.assertTrue('BulkDataURI' in b[0]['7FE00010'])
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	493
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	494 url = b[0]['7FE00010']['BulkDataURI']
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	495 self.assertTrue(url.startswith(prefix))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	496
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	497 p = DoGetMultipart(ORTHANC, url[len(prefix):])
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	498
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	499 self.assertEqual(2, len(p)) # There are 2 fragments in this image
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	500 self.assertEqual(4, len(p[0]))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	501 self.assertEqual(114486, len(p[1]))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	502
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	503
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	504 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	505 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	506 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	507 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	508 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	509 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	510
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	511 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	512 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	513 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	514 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	515
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	516 # 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	517 # the following fix was not included yet:
586 4ee2cdbfc602 hg url Alain Mazy <am@osimis.io> parents: 575 diff changeset	518 # https://orthanc.uclouvain.be/hg/orthanc/rev/b88937ef597b
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	519
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	520 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	521 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	522
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	523 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	524 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	525
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	526 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	527 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	528 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	529 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	530
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	531 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	532 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	533
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	534 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	535 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	536 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	537
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	538
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	539 def test_bitbucket_issue_112(self):
223 f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	540 # Wrong serialization of number values
588 8aa101e126d0 migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 586 diff changeset	541 # https://orthanc.uclouvain.be/bugs/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	542 # 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	543
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	544 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	545 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	546
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	547 # 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	548 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	549 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	550 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	551
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	552 if (sys.version_info >= (3, 0)):
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	553 types = (int)
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	554 else:
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	555 types = (int, long)
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	556
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	557 b = a[0]['00180091']['Value'][0]
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	558 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	559 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	560
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	561 # 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	562 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	563 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	564 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	565
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	566 b = a[0]['00201208']['Value'][0]
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	567 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	568 self.assertEqual(1, b)
223 f5aca0917d60 DICOMweb: test_bitbucket_issue_111 Sebastien Jodogne <s.jodogne@gmail.com> parents: 222 diff changeset	569
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	570
224 f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	571 def test_bitbucket_issue_113(self):
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	572 # Wrong serialization of PN VR
588 8aa101e126d0 migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 586 diff changeset	573 # https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=113
224 f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	574 # https://bitbucket.org/sjodogne/orthanc-dicomweb/issues/2/
314 59e8a50bef00 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	575
59e8a50bef00 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	576 # Make sure UTF-8 encoding is used
59e8a50bef00 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	577 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	578
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	579 UploadInstance(ORTHANC, 'Encodings/DavidClunie/SCSX1')
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	580 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	581
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	582 # This is the WADO-RS testing
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	583 a = DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study)
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	584 self.assertEqual(1, len(a))
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	585
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	586 pn = a[0]['00100010'] # Patient name
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	587 self.assertEqual('PN', pn['vr'])
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	588 self.assertEqual(1, len(pn['Value']))
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	589 self.assertEqual('Wang^XiaoDong', pn['Value'][0]['Alphabetic'])
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	590 self.assertEqual(u'王^小東', pn['Value'][0]['Ideographic'])
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	591
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	592 # This is the QIDO-RS testing
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	593 a = DoGet(ORTHANC, '/dicom-web/studies')
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	594 self.assertEqual(1, len(a))
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	595
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	596 pn = a[0]['00100010'] # Patient name
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	597 self.assertEqual('PN', pn['vr'])
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	598 self.assertEqual(1, len(pn['Value']))
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	599 self.assertEqual('Wang^XiaoDong', pn['Value'][0]['Alphabetic'])
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	600 self.assertEqual(u'王^小東', pn['Value'][0]['Ideographic'])
f5414254ccaa test_bitbucket_issue_113 Sebastien Jodogne <s.jodogne@gmail.com> parents: 223 diff changeset	601
222 0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	602
225 4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	603 def test_bitbucket_issue_96(self):
4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	604 # WADO-RS RetrieveFrames rejects valid accept headers
588 8aa101e126d0 migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 586 diff changeset	605 # https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=96
225 4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	606 # https://bitbucket.org/sjodogne/orthanc-dicomweb/issues/5/
4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	607
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	608 UploadInstance(ORTHANC, 'Brainix/Epi/IM-0001-0001.dcm')
225 4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	609
4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	610 a = DoGet(ORTHANC, '/dicom-web/instances')
4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	611 self.assertEqual(1, len(a))
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	612 self.assertEqual(256, a[0]['00280010']['Value'][0]) # Rows
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	613 self.assertEqual(256, a[0]['00280011']['Value'][0]) # Columns
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	614 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	615
225 4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	616 url = a[0]['00081190']['Value'][0]
4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	617
278 514785dacd6d fix dicomweb tests with debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 277 diff changeset	618 prefix = 'http://%s:%s' % (args.server, args.rest)
225 4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	619 self.assertTrue(url.startswith(prefix))
4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	620 uri = url[len(prefix):]
4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	621
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	622 self.assertRaises(Exception, lambda: DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 0)))
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	623 self.assertRaises(Exception, lambda: DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 2)))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	624
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	625 b = DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 1))
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	626 self.assertEqual(1, len(b))
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	627 self.assertEqual(256 * 256 * 2, len(b[0]))
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	628 self.assertEqual('ce394eb4d4de4eeef348436108101f3b', ComputeMD5(b[0]))
225 4d5af1f49cb2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	629
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	630 c = DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 1),
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	631 headers = { 'Accept' : 'multipart/related; type=application/octet-stream' })
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	632 self.assertEqual(1, len(c))
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	633 self.assertEqual(b[0], c[0])
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	634 self.assertEqual('ce394eb4d4de4eeef348436108101f3b', ComputeMD5(c[0]))
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	635
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	636 c = DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 1),
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	637 headers = { 'Accept' : 'multipart/related; type="application/octet-stream"' })
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	638 self.assertEqual(1, len(c))
230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	639 self.assertEqual(b[0], c[0])
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	640 self.assertEqual('ce394eb4d4de4eeef348436108101f3b', ComputeMD5(c[0]))
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	641
228 84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	642 self.assertRaises(Exception, lambda: DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 1),
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	643 headers = { 'Accept' : 'multipart/related; type="nope"' }))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	644
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	645 self.assertRaises(Exception, lambda: DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 1),
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	646 headers = { 'Accept' : 'multipart/related; type=nope' }))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	647
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	648 self.assertRaises(Exception, lambda: DoGetMultipart(ORTHANC, '%s/frames/%d' % (uri, 1),
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	649 headers = { 'Accept' : 'nope' }))
84244277413b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 227 diff changeset	650
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	651
608 ba06331ac8dd new test for issue 219 Alain Mazy <am@osimis.io> parents: 588 diff changeset	652 def test_bugzilla_219(self):
ba06331ac8dd new test for issue 219 Alain Mazy <am@osimis.io> parents: 588 diff changeset	653 # WADO-RS RetrieveFrames shall transcode ExplicitBigEndian to ExplicitLittleEndian
ba06331ac8dd new test for issue 219 Alain Mazy <am@osimis.io> parents: 588 diff changeset	654 # https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=219
ba06331ac8dd new test for issue 219 Alain Mazy <am@osimis.io> parents: 588 diff changeset	655
ba06331ac8dd new test for issue 219 Alain Mazy <am@osimis.io> parents: 588 diff changeset	656 if IsPluginVersionAbove(ORTHANC, "dicom-web", 1, 17, 0):
ba06331ac8dd new test for issue 219 Alain Mazy <am@osimis.io> parents: 588 diff changeset	657
ba06331ac8dd new test for issue 219 Alain Mazy <am@osimis.io> parents: 588 diff changeset	658 UploadInstance(ORTHANC, 'TransferSyntaxes/1.2.840.10008.1.2.2.dcm')
ba06331ac8dd new test for issue 219 Alain Mazy <am@osimis.io> parents: 588 diff changeset	659
ba06331ac8dd new test for issue 219 Alain Mazy <am@osimis.io> parents: 588 diff changeset	660 r = DoGetMultipart(ORTHANC, '/dicom-web/studies/1.2.840.113619.2.21.848.246800003.0.1952805748.3/series/1.2.840.113619.2.21.24680000.700.0.1952805748.3.0/instances/1.2.840.1136190195280574824680000700.3.0.1.19970424140438/frames/1', {}, True )
ba06331ac8dd new test for issue 219 Alain Mazy <am@osimis.io> parents: 588 diff changeset	661 self.assertIn('transfer-syntax=1.2.840.10008.1.2.1', r[0][1]['Content-Type'])
ba06331ac8dd new test for issue 219 Alain Mazy <am@osimis.io> parents: 588 diff changeset	662
ba06331ac8dd new test for issue 219 Alain Mazy <am@osimis.io> parents: 588 diff changeset	663
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	664 def test_qido_fields(self):
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	665 UploadInstance(ORTHANC, 'DummyCT.dcm')
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 a = DoGet(ORTHANC, '/dicom-web/studies')
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	668 self.assertEqual(1, len(a))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	669 self.assertFalse('00280010' in a[0]) # Rows
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	670
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	671 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	672 self.assertEqual(1, len(a))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	673 self.assertTrue('00280010' in a[0])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	674 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	675
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	676 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	677 self.assertEqual(0, len(a))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	678
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	679 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	680 self.assertEqual(1, len(a))
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	681 self.assertTrue('00280010' in a[0])
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	682 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	683
226 230aede7f8d5 test_bitbucket_issue_96 Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	684
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	685 def test_stow_errors(self):
398 9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	686 def CheckSequences(a):
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	687 self.assertEqual(3, len(a))
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	688 self.assertTrue('00080005' in a)
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	689 self.assertTrue('00081198' in a)
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	690 self.assertTrue('00081199' in a)
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	691 self.assertEqual('CS', a['00080005']['vr'])
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	692 self.assertEqual('SQ', a['00081198']['vr'])
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	693 self.assertEqual('SQ', a['00081199']['vr'])
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	694
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	695 # Pushing an instance to a study that is not its parent
398 9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	696 (status, a) = SendStowRaw(ORTHANC, args.dicomweb + '/studies/nope', GetDatabasePath('Phenix/IM-0001-0001.dcm'))
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	697 self.assertEqual(409, status)
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	698 CheckSequences(a)
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	699
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	700 self.assertFalse('Value' in a['00081199']) # No success instance
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	701
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	702 self.assertEqual(1, len(a['00081198']['Value'])) # One failed instance
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	703 self.assertEqual('1.2.840.10008.5.1.4.1.1.2',
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	704 a['00081198']['Value'][0]['00081150']['Value'][0])
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	705 self.assertEqual('1.2.840.113704.7.1.1.6632.1127829031.2',
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	706 a['00081198']['Value'][0]['00081155']['Value'][0])
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	707 self.assertEqual(0x0110, # Processing failure
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	708 a['00081198']['Value'][0]['00081197']['Value'][0])
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	709
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	710 # Pushing an instance with missing tags
398 9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	711 (status, a) = SendStowRaw(ORTHANC, args.dicomweb + '/studies', GetDatabasePath('Issue111.dcm'))
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	712 self.assertEqual(400, status)
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	713 CheckSequences(a)
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	714
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	715 self.assertFalse('Value' in a['00081198']) # No failed instance, as tags are missing
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	716 self.assertFalse('Value' in a['00081199']) # No success instance
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	717
875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	718 # Pushing a file that is not in the DICOM format
398 9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	719 (status, a) = SendStowRaw(ORTHANC, args.dicomweb + '/studies', GetDatabasePath('Issue111.dump'))
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	720 self.assertEqual(400, status)
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	721 CheckSequences(a)
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	722
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	723 self.assertFalse('Value' in a['00081198']) # No failed instance, as non-DICOM
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	724 self.assertFalse('Value' in a['00081199']) # No success instance
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	725
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	726 # Pushing a DICOM instance with only SOP class and instance UID
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	727 (status, a) = SendStowRaw(ORTHANC, args.dicomweb + '/studies', GetDatabasePath('Issue196.dcm'))
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	728 self.assertEqual(400, status)
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	729 CheckSequences(a)
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	730
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	731 self.assertFalse('Value' in a['00081199']) # No success instance
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	732
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	733 self.assertEqual(1, len(a['00081198']['Value'])) # One failed instance
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	734 self.assertEqual('1.2.840.10008.5.1.4.1.1.4',
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	735 a['00081198']['Value'][0]['00081150']['Value'][0])
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	736 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109',
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	737 a['00081198']['Value'][0]['00081155']['Value'][0])
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	738 self.assertEqual(0xC000, # Error: Cannot understand (cannot understand certain Data Elements)
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances) Sebastien Jodogne <s.jodogne@gmail.com> parents: 388 diff changeset	739 a['00081198']['Value'][0]['00081197']['Value'][0])
227 875ff7460ae8 test_qido_fields, test_stow_errors Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	740
239 8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	741
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	742 def test_allowed_methods(self):
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	743 self.assertEqual(0, len(DoGet(ORTHANC, '/dicom-web/studies')))
8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	744
549 bcd87bf59630 fix DICOMweb tests: test_allowed_methods and test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	745 e = DoPutRaw(ORTHANC, '/dicom-web/studies')
bcd87bf59630 fix DICOMweb tests: test_allowed_methods and test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	746 self.assertEqual(405, int(e[0]['status']))
bcd87bf59630 fix DICOMweb tests: test_allowed_methods and test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	747 self.assertEqual('GET,POST', e[0]['allow'])
239 8980bd19e31d dicomweb: test_allowed_methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 229 diff changeset	748
549 bcd87bf59630 fix DICOMweb tests: test_allowed_methods and test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	749 e = DoDeleteRaw(ORTHANC, '/dicom-web/studies')
bcd87bf59630 fix DICOMweb tests: test_allowed_methods and test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	750 self.assertEqual(405, int(e[0]['status']))
bcd87bf59630 fix DICOMweb tests: test_allowed_methods and test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	751 self.assertEqual('GET,POST', e[0]['allow'])
241 adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	752
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	753
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	754 def test_add_server(self):
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	755 try:
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	756 DoDelete(ORTHANC, '/dicom-web/servers/hello')
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	757 except:
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	758 pass
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	759
277 95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	760 try:
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	761 DoDelete(ORTHANC, '/dicom-web/servers/google') # If "AllWindowsStart.sh" is used
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	762 except:
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	763 pass
95c47602990c fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 276 diff changeset	764
241 adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	765 l = DoGet(ORTHANC, '/dicom-web/servers')
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	766 self.assertEqual(1, len(l))
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	767 self.assertTrue('sample' in l)
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	768
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	769 url = 'http://localhost:8042/dicom-web/'
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	770 DoPut(ORTHANC, '/dicom-web/servers/hello', {
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	771 'Url': url,
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	772 'HttpHeaders' : {
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	773 'Hello' : 'World'
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	774 },
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	775 'Username' : 'bob',
242 c6ffdd0ea04b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 241 diff changeset	776 'Password' : 'password',
c6ffdd0ea04b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 241 diff changeset	777 'UserProperty' : 'Test',
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	778 'HasDelete' : True,
381 fd6d805eae37 new option "Timeout" in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 367 diff changeset	779 'Timeout' : 66 # New in 1.6
241 adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	780 })
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	781
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	782 l = DoGet(ORTHANC, '/dicom-web/servers')
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	783 self.assertEqual(2, len(l))
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	784 self.assertTrue('sample' in l)
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	785 self.assertTrue('hello' in l)
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	786
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	787 o = DoGet(ORTHANC, '/dicom-web/servers/sample')
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	788 self.assertEqual(5, len(o))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	789 self.assertTrue('stow' in o)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	790 self.assertTrue('retrieve' in o)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	791 self.assertTrue('get' in o)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	792 self.assertTrue('wado' in o) # New in 0.7
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	793 self.assertTrue('qido' in o) # New in 0.7
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	794
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	795 o = DoGet(ORTHANC, '/dicom-web/servers/hello')
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	796 self.assertEqual(6, len(o))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	797 self.assertTrue('stow' in o)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	798 self.assertTrue('retrieve' in o)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	799 self.assertTrue('get' in o)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	800 self.assertTrue('wado' in o) # New in 0.7
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	801 self.assertTrue('qido' in o) # New in 0.7
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	802 self.assertTrue('delete' in o) # New in 0.7
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	803
241 adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	804 s = DoGet(ORTHANC, '/dicom-web/servers?expand')
381 fd6d805eae37 new option "Timeout" in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 367 diff changeset	805 self.assertEqual(8, len(s['hello']))
241 adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	806 self.assertEqual(url, s['hello']['Url'])
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	807 self.assertEqual('bob', s['hello']['Username'])
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	808 self.assertEqual(None, s['hello']['Password'])
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	809 self.assertFalse(s['hello']['Pkcs11'])
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	810 self.assertEqual(1, len(s['hello']['HttpHeaders']))
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	811 self.assertTrue('Hello' in s['hello']['HttpHeaders'])
242 c6ffdd0ea04b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 241 diff changeset	812 self.assertEqual('Test', s['hello']['UserProperty'])
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	813 self.assertEqual('1', s['hello']['HasDelete'])
388 3ef44d201875 revert incorrect changeset 386 Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	814 self.assertEqual(66, s['hello']['Timeout']) # New in 1.6 (interpreted as a string in <= 1.5)
241 adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	815
adc6372b8820 dicomweb: test_add_server Sebastien Jodogne <s.jodogne@gmail.com> parents: 239 diff changeset	816 DoDelete(ORTHANC, '/dicom-web/servers/hello')
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	817
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	818
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	819 def test_bitbucket_issue_143(self):
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	820 # WADO-RS metadata request returns "500 Internal Server Error"
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	821 # instead of "404 Not Found" for missing instance
588 8aa101e126d0 migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 586 diff changeset	822 # https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=143
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	823 UploadInstance(ORTHANC, 'Issue143.dcm')
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	824
549 bcd87bf59630 fix DICOMweb tests: test_allowed_methods and test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	825 e = DoGetRaw(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')
bcd87bf59630 fix DICOMweb tests: test_allowed_methods and test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	826 self.assertEqual(404, int(e[0]['status']))
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	827
e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	828 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	829
549 bcd87bf59630 fix DICOMweb tests: test_allowed_methods and test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	830 e = DoGetRaw(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')
bcd87bf59630 fix DICOMweb tests: test_allowed_methods and test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	831 self.assertEqual(404, int(e[0]['status']))
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	832
549 bcd87bf59630 fix DICOMweb tests: test_allowed_methods and test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	833 e = DoGetRaw(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')
bcd87bf59630 fix DICOMweb tests: test_allowed_methods and test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	834 self.assertEqual(404, int(e[0]['status']))
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	835
549 bcd87bf59630 fix DICOMweb tests: test_allowed_methods and test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	836 e = DoGetRaw(ORTHANC, '/dicom-web/studies/0.0.0.0.0/series/0.0.0.0.0/instances/0.0.0.0.0/metadata')
bcd87bf59630 fix DICOMweb tests: test_allowed_methods and test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	837 self.assertEqual(404, int(e[0]['status']))
246 e4e0e2ff91ae test_bitbucket_issue_143 Sebastien Jodogne <s.jodogne@gmail.com> parents: 244 diff changeset	838
248 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_qido(self):
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	841 # The "DefaultEncoding" condifuration option is set to "UTF8"
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	842 # 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	843 # 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	844 def GetPatientName(dicom, onlyAlphabetic):
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	845 i = UploadInstance(ORTHANC, dicom) ['ID']
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	846 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	847 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	848 self.assertEqual(1, len(qido))
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	849 self.assertEqual('CS', qido[0]['00080005']['vr'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	850 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	851 if onlyAlphabetic:
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	852 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	853 else:
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	854 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	855 return qido[0]['00100010']['Value'][0]
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	856
314 59e8a50bef00 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	857 # Make sure UTF-8 encoding is used
59e8a50bef00 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	858 self.assertEqual('Utf8', DoPut(ORTHANC, '/tools/default-encoding', 'Utf8'))
59e8a50bef00 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	859
248 26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	860 # 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	861
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	862 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	863 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	864 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	865 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	866 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	867 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	868
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	869 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	870 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	871 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	872 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	873 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	874 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	875 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	876 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	877 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	878 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	879 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	880 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	881 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	882
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	883 # 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	884 #self.assertEqual(u'山田^太郎', GetPatientName('Encodings/DavidClunie/SCSH32')['Ideographic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	885 #self.assertEqual(u'やまだ^たろう', GetPatientName('Encodings/DavidClunie/SCSH32')['Phonetic'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	886
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	887
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	888 def test_encodings_wado_metadata(self):
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	889 # If querying the instance metadata, the "DefaultEncoding"
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	890 # configuration is not used, but the actual encoding
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	891 def GetEncoding(dicom, length):
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	892 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	893 self.assertEqual(1, len(qido))
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	894 self.assertEqual(length, len(qido[0]['00080005']['Value']))
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	895 self.assertEqual('CS', qido[0]['00080005']['vr'])
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	896 return qido[0]['00080005']['Value']
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	897
26c3a1ed935a testing of encodings in DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 246 diff changeset	898 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	899 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	900 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	901 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	902 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	903 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	904 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	905 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	906 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	907 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	908 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	909 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	910
249 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 def test_rendered(self):
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	913 def RenderFrame(path, i):
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	914 return DoPost(ORTHANC, '/dicom-web/servers/sample/get', {
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	915 'Uri' : '%s/frames/%d/rendered' % (path, i)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	916 })
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	917
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	918 # This image has 76 frames
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	919 path = UploadAndGetWadoPath('Multiframe.dcm')
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	920
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	921 self.assertRaises(Exception, lambda: RenderFrame(path, 0))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	922
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	923 frame1 = RenderFrame(path, 1)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	924 im = UncompressImage(frame1)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	925 self.assertEqual("L", im.mode)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	926 self.assertEqual(512, im.size[0])
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	927 self.assertEqual(512, im.size[1])
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	928
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	929 im = UncompressImage(RenderFrame(path, 76))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	930 self.assertEqual("L", im.mode)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	931 self.assertEqual(512, im.size[0])
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	932 self.assertEqual(512, im.size[1])
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	933
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	934 self.assertRaises(Exception, lambda: RenderFrame(path, 77))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	935
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	936 defaultFrame = DoPost(ORTHANC, '/dicom-web/servers/sample/get', {
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	937 'Uri' : '%s/rendered' % path
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	938 })
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	939
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	940 self.assertEqual(len(frame1), len(defaultFrame))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	941 self.assertEqual(frame1, defaultFrame)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	942
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	943
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	944 # This image has 1 frame
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	945 path = UploadAndGetWadoPath('Phenix/IM-0001-0001.dcm')
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	946
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	947 self.assertRaises(Exception, lambda: RenderFrame(path, 0))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	948 self.assertRaises(Exception, lambda: RenderFrame(path, 2))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	949
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	950 frame1 = RenderFrame(path, 1)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	951 im = UncompressImage(frame1)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	952 self.assertEqual("L", im.mode)
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	953 self.assertEqual(512, im.size[0])
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	954 self.assertEqual(358, im.size[1])
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	955
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	956 defaultFrame = DoPost(ORTHANC, '/dicom-web/servers/sample/get', {
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	957 'Uri' : '%s/rendered' % path
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	958 })
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	959
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	960 self.assertEqual(len(frame1), len(defaultFrame))
24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	961 self.assertEqual(frame1, defaultFrame)
259 298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	962
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	963
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	964 def test_qido_parent_attributes(self):
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	965 UploadInstance(ORTHANC, 'Brainix/Flair/IM-0001-0001.dcm')
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	966 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	967 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	968 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	969
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	970 a = DoGet(ORTHANC, '/dicom-web/studies')
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	971 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	972 self.assertFalse('00080018' in a[0]) # SOPInstanceUID
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	973 self.assertFalse('0020000E' in a[0]) # SeriesInstanceUID
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	974 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	975 self.assertEqual('BRAINIX', a[0]['00100010']['Value'][0]['Alphabetic'])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	976
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	977 a = DoGet(ORTHANC, '/dicom-web/studies?0020000D=%s' % study)
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	978 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	979 self.assertFalse('00080018' in a[0]) # SOPInstanceUID
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	980 self.assertFalse('0020000E' in a[0]) # SeriesInstanceUID
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	981 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	982 self.assertEqual('BRAINIX', a[0]['00100010']['Value'][0]['Alphabetic'])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	983
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	984 a = DoGet(ORTHANC, '/dicom-web/series')
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	985 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	986 self.assertFalse('00080018' in a[0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	987 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	988 self.assertEqual(series, a[0]['0020000E']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	989 self.assertEqual('MR', a[0]['00080060']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	990 self.assertEqual('BRAINIX', a[0]['00100010']['Value'][0]['Alphabetic'])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	991
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	992 a = DoGet(ORTHANC, '/dicom-web/instances')
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	993 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	994 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	995 self.assertEqual(series, a[0]['0020000E']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	996 self.assertEqual(instance, a[0]['00080018']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	997 self.assertEqual('MR', a[0]['00080060']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	998 self.assertEqual('BRAINIX', a[0]['00100010']['Value'][0]['Alphabetic'])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	999
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1000 a = DoGet(ORTHANC, '/dicom-web/studies/%s/series' % study)
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1001 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1002 self.assertFalse('00080018' in a[0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1003 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1004 self.assertEqual(series, a[0]['0020000E']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1005 self.assertEqual('MR', a[0]['00080060']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1006 self.assertEqual('BRAINIX', a[0]['00100010']['Value'][0]['Alphabetic'])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1007
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1008 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	1009 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1010 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1011 self.assertEqual(series, a[0]['0020000E']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1012 self.assertEqual(instance, a[0]['00080018']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1013 self.assertEqual('MR', a[0]['00080060']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1014 self.assertEqual('BRAINIX', a[0]['00100010']['Value'][0]['Alphabetic'])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1015
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1016 # "If {StudyInstanceUID} is not specified, all Study-level
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1017 # attributes specified in Table 6.7.1-2" => Here,
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1018 # {StudyInstanceUID} is specified, so we must not get the
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1019 # PatientName.
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1020 # 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	1021 a = DoGet(ORTHANC, '/dicom-web/series?0020000D=%s' % study)
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1022 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1023 self.assertFalse('00100010' in a[0]) # PatientName
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1024 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1025 self.assertEqual(series, a[0]['0020000E']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1026 self.assertEqual('MR', a[0]['00080060']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1027
487 18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1028 # if we ask explicitely for the Patient and Study tags, we must get it
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1029 a = DoGet(ORTHANC, '/dicom-web/series?0020000D=%s&includefield=00100010&includefield=00080020' % study)
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1030 self.assertEqual(1, len(a))
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1031 self.assertTrue('00100010' in a[0]) # PatientName
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1032 self.assertTrue('00080020' in a[0]) # StudyDate
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1033
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1034 # if {StudyInstanceUID} is not specified, we must get the PatientName
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1035 a = DoGet(ORTHANC, '/dicom-web/series')
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1036 self.assertTrue('00100010' in a[0]) # PatientName
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1037
259 298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1038 # 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	1039 a = DoGet(ORTHANC, '/dicom-web/instances?0020000D=%s' % study)
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1040 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1041 self.assertFalse('00100010' in a[0]) # PatientName
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1042 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1043 self.assertEqual(series, a[0]['0020000E']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1044 self.assertEqual('MR', a[0]['00080060']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1045
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1046 a = DoGet(ORTHANC, '/dicom-web/instances?0020000E=%s' % series)
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1047 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1048 self.assertFalse('00080060' in a[0]) # Modality
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1049 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1050 self.assertEqual(series, a[0]['0020000E']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1051 self.assertEqual('BRAINIX', a[0]['00100010']['Value'][0]['Alphabetic'])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1052
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1053 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	1054 self.assertEqual(1, len(a))
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1055 self.assertFalse('00100010' in a[0]) # PatientName
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1056 self.assertFalse('00080060' in a[0]) # Modality
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1057 self.assertEqual(study, a[0]['0020000D']['Value'][0])
298f80c6ccc4 test_qido_parent_attributes Sebastien Jodogne <s.jodogne@gmail.com> parents: 249 diff changeset	1058 self.assertEqual(series, a[0]['0020000E']['Value'][0])
261 b8cdb0aef4b9 test_bitbucket_issue_164 Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	1059
487 18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1060 # if we ask explicitely for the Patient and Study tags, we must get it
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1061 a = DoGet(ORTHANC, '/dicom-web/instances?0020000D=%s&includefield=00100010&includefield=00080020' % study)
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1062 self.assertEqual(1, len(a))
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1063 self.assertTrue('00100010' in a[0]) # PatientName
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1064 self.assertTrue('00080020' in a[0]) # StudyDate
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1065
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1066 # if {StudyInstanceUID} is not specified, we must get all Study, Series and Patient tags
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1067 a = DoGet(ORTHANC, '/dicom-web/instances')
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1068 self.assertTrue('00100010' in a[0]) # PatientName
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1069 self.assertTrue('00080020' in a[0]) # StudyDate
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1070 self.assertTrue('00080060' in a[0]) # Modality
18f2d55182fd more dicom-web tests Alain Mazy <am@osimis.io> parents: 449 diff changeset	1071
261 b8cdb0aef4b9 test_bitbucket_issue_164 Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	1072
270 082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1073 #@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	1074 def test_bitbucket_issue_164(self):
270 082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1075 # WARNING - This makes GDCM 2.8.4 crash
588 8aa101e126d0 migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 586 diff changeset	1076 # https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=164
261 b8cdb0aef4b9 test_bitbucket_issue_164 Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	1077 UploadInstance(ORTHANC, 'Issue164.dcm')
b8cdb0aef4b9 test_bitbucket_issue_164 Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	1078
b8cdb0aef4b9 test_bitbucket_issue_164 Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	1079 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	1080 self.assertEqual(1, len(p))
b8cdb0aef4b9 test_bitbucket_issue_164 Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	1081 self.assertEqual(743 * 975 * 3, len(p[0]))
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1082
539 ef41b62b456e updated DicomWEB tests for YBR images that are not transformed into RGB anymore Alain Mazy <am@osimis.io> parents: 537 diff changeset	1083 metadata = DoGet(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/metadata')
ef41b62b456e updated DicomWEB tests for YBR images that are not transformed into RGB anymore Alain Mazy <am@osimis.io> parents: 537 diff changeset	1084 self.assertEqual("YBR_FULL_422", metadata[0]['00280004']['Value'][0])
ef41b62b456e updated DicomWEB tests for YBR images that are not transformed into RGB anymore Alain Mazy <am@osimis.io> parents: 537 diff changeset	1085
543 8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1086 # TODO
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1087 # # starting from X.XX.X, Orthanc won't convert YBR to RGB anymore -> new checksum (https://discourse.orthanc-server.org/t/orthanc-convert-ybr-to-rgb-but-does-not-change-metadata/3533)
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1088 # if IsOrthancVersionAbove(ORTHANC, 1, XX, 1):
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1089 # expectedDcmtkChecksum = '7535a11e7da0fa590c467ac9d323c5c1'
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1090 # else:
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1091 expectedDcmtkChecksum = 'b3662c4bfa24a0c73abb08548c63319b'
539 ef41b62b456e updated DicomWEB tests for YBR images that are not transformed into RGB anymore Alain Mazy <am@osimis.io> parents: 537 diff changeset	1092
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1093 if HasGdcmPlugin(ORTHANC):
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1094 self.assertTrue(ComputeMD5(p[0]) in [
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1095 'b952d67da9ff004b0adae3982e89d620', # GDCM >= 3.0
539 ef41b62b456e updated DicomWEB tests for YBR images that are not transformed into RGB anymore Alain Mazy <am@osimis.io> parents: 537 diff changeset	1096 expectedDcmtkChecksum # Fallback to DCMTK
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1097 ])
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1098 else:
539 ef41b62b456e updated DicomWEB tests for YBR images that are not transformed into RGB anymore Alain Mazy <am@osimis.io> parents: 537 diff changeset	1099 self.assertEqual(expectedDcmtkChecksum, ComputeMD5(p[0])) # DCMTK
270 082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1100
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1101
271 d202bfcd7b96 typo Sebastien Jodogne <s.jodogne@gmail.com> parents: 270 diff changeset	1102 def test_bitbucket_issue_168(self):
276 cc10eefaf908 note Sebastien Jodogne <s.jodogne@gmail.com> parents: 275 diff changeset	1103 # "Plugins can't read private tags from the configuration
cc10eefaf908 note Sebastien Jodogne <s.jodogne@gmail.com> parents: 275 diff changeset	1104 # 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	1105 # 16.04), or if Orthanc <= 1.5.8
588 8aa101e126d0 migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 586 diff changeset	1106 # https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=168
270 082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1107
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1108 UploadInstance(ORTHANC, 'Issue168.dcm')
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1109
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1110 a = DoGet(ORTHANC, '/dicom-web/studies')
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1111 self.assertEqual(1, len(a))
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1112 self.assertFalse('00090010' in a[0])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1113 self.assertFalse('00091001' in a[0])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1114 self.assertEqual('20170404', a[0]['00080020']['Value'][0])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1115
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1116 a = DoGet(ORTHANC, '/dicom-web/studies?includefield=00091001')
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1117 self.assertEqual(1, len(a))
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1118 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	1119 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	1120 self.assertEqual('DS', a[0]['00091001']['vr'])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1121 self.assertEqual(1, len(a[0]['00091001']['Value']))
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1122 self.assertAlmostEqual(98.41, a[0]['00091001']['Value'][0])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1123
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1124 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	1125 self.assertEqual(1, len(a))
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1126 self.assertTrue('00090010' in a[0])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1127 self.assertEqual('LO', a[0]['00090010']['vr'])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1128 self.assertEqual(1, len(a[0]['00090010']['Value']))
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1129 self.assertEqual('Lunit', a[0]['00090010']['Value'][0])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1130 self.assertTrue('00091001' in a[0])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1131 self.assertEqual('DS', a[0]['00091001']['vr'])
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1132 self.assertEqual(1, len(a[0]['00091001']['Value']))
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1133 self.assertAlmostEqual(98.41, a[0]['00091001']['Value'][0])
249 24e5c8ca9440 DICOMweb: test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 248 diff changeset	1134
270 082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1135 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	1136 self.assertEqual(0, len(a))
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1137
082f35cb4459 test_bitbuck_issue_168 Sebastien Jodogne <s.jodogne@gmail.com> parents: 261 diff changeset	1138
272 a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1139 def test_rendered_studies_series(self):
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1140 i = UploadInstance(ORTHANC, 'Phenix/IM-0001-0001.dcm') ['ID']
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1141 study = DoGet(ORTHANC, '/instances/%s/tags?simplify' % i) ['StudyInstanceUID']
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1142 series = DoGet(ORTHANC, '/instances/%s/tags?simplify' % i) ['SeriesInstanceUID']
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1143 instance = DoGet(ORTHANC, '/instances/%s/tags?simplify' % i) ['SOPInstanceUID']
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1144
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1145 a = DoPost(ORTHANC, '/dicom-web/servers/sample/get', {
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1146 '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	1147 })
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1148
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1149 im = UncompressImage(a)
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1150 self.assertEqual("L", im.mode)
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1151 self.assertEqual(512, im.size[0])
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1152 self.assertEqual(358, im.size[1])
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1153
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1154 b = DoPost(ORTHANC, '/dicom-web/servers/sample/get', {
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1155 'Uri' : '/studies/%s/series/%s/rendered' % (study, series)
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1156 })
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1157
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1158 self.assertEqual(len(a), len(b))
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1159 self.assertEqual(a, b)
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1160
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1161 c = DoPost(ORTHANC, '/dicom-web/servers/sample/get', {
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1162 'Uri' : '/studies/%s/rendered' % study
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1163 })
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1164
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1165 self.assertEqual(len(a), len(c))
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1166 self.assertEqual(a, c)
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1167
a94b0409fdac test_rendered_studies_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 271 diff changeset	1168
273 afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1169 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	1170 # "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	1171 # 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	1172
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1173 UploadInstance(ORTHANC, 'DummyCT.dcm')
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1174 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	1175
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1176 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	1177
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1178 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	1179 headers = { 'Accept' : 'application/json, application/dicom+json' })))
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1180
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1181 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	1182 headers = { 'Accept' : 'application/json' })))
6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1183
6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1184 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study,
6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1185 headers = { 'Accept' : 'application/dicom+json' })))
6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1186
6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1187 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	1188 headers = { 'Accept' : 'toto, application/dicom+json' })))
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1189
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1190 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	1191 headers = { 'Accept' : 'application/json, tata' })))
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1192
afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1193 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	1194 headers = { 'Accept' : 'toto' }))
6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1195
6b522ef4c3ec cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	1196 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	1197 headers = { 'Accept' : 'toto, tata' }))
275 264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1198
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1199 # https://groups.google.com/d/msg/orthanc-users/9o5kItsMQI0/Og6B27YyBgAJ
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1200 self.assertEqual(1, len(DoGetMultipart(ORTHANC, '/dicom-web/studies/%s/metadata' % study,
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1201 headers = { 'Accept' : 'multipart/related;type=application/dicom+xml' })))
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1202
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1203 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study,
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1204 headers = { 'Accept' : 'application/json, application/dicom+xml' })))
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1205
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1206 self.assertEqual(1, len(DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % study,
264bb7744679 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 274 diff changeset	1207 headers = { 'Accept' : 'application/dicom+xml, application/json' })))
284 7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1208
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1209
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1210
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1211 def test_bitbucket_issue_56(self):
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1212 # "Case-insensitive matching over accents" => DICOMweb part
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1213 # from AlexanderM on 2020-03-20
588 8aa101e126d0 migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 586 diff changeset	1214 # https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=56
284 7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1215 UploadInstance(ORTHANC, 'Issue56-NoPixelData.dcm')
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1216
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1217 self.assertEqual(1, len(DoPost(ORTHANC, '/tools/find', {
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1218 'Level' : 'Patient',
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1219 'Query' : {
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1220 'PatientName' : 'Гусева*',
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1221 },
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1222 })))
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1223
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1224 self.assertEqual(1, len(DoPost(ORTHANC, '/tools/find', {
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1225 'Level' : 'Patient',
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1226 'Query' : {
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1227 'PatientName' : 'гусева*',
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1228 },
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1229 })))
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1230
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1231 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	1232 headers = { 'accept' : 'application/json' })))
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1233
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1234 # This line is the issue
284 7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1235 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	1236 headers = { 'accept' : 'application/json' })))
7fa5c7a03137 added test for issue 56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 278 diff changeset	1237
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1238
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1239 def test_frames_transcoding(self):
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1240 ACCEPT = {
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1241 '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	1242 '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	1243 '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	1244 '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	1245 '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	1246 '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	1247 }
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1248
321 3c8c6b41eec4 dealing with Content-Location in test_frames_transcoding of DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 319 diff changeset	1249 uri = 'dicom-web%s' % UploadAndGetWadoPath('TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm')
539 ef41b62b456e updated DicomWEB tests for YBR images that are not transformed into RGB anymore Alain Mazy <am@osimis.io> parents: 537 diff changeset	1250 truthRGB = Image.open(GetDatabasePath('TransferSyntaxes/1.2.840.10008.1.2.4.50.png'))
543 8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1251
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1252 # TODO
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1253 # # starting from X.XX.X, Orthanc won't convert YBR to RGB anymore -> new checksum (https://discourse.orthanc-server.org/t/orthanc-convert-ybr-to-rgb-but-does-not-change-metadata/3533)
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1254 # with open(GetDatabasePath('TransferSyntaxes/1.2.840.10008.1.2.4.50.YBR.raw'), 'rb') as f:
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1255 # truthRawYbr = f.read()
539 ef41b62b456e updated DicomWEB tests for YBR images that are not transformed into RGB anymore Alain Mazy <am@osimis.io> parents: 537 diff changeset	1256
ef41b62b456e updated DicomWEB tests for YBR images that are not transformed into RGB anymore Alain Mazy <am@osimis.io> parents: 537 diff changeset	1257 # first test: no transcoding since we accept the JPEG transfer syntax
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1258 a = DoGetMultipart(ORTHANC, '%s/frames/1' % uri,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1259 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	1260 returnHeaders = True)
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1261 self.assertEqual(1, len(a))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1262 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	1263 self.assertEqual('%s%s/frames/1' % (ORTHANC['Url'], uri),
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1264 a[0][1]['Content-Location'])
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1265 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	1266 'multipart/related; type=%s' % a[0][1]['Content-Type'])
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1267 self.assertEqual(53476, len(a[0][0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1268 self.assertEqual('142fdb8a1dc2aa7e6b8952aa294a6e22', ComputeMD5(a[0][0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1269
539 ef41b62b456e updated DicomWEB tests for YBR images that are not transformed into RGB anymore Alain Mazy <am@osimis.io> parents: 537 diff changeset	1270 # second test: no accept header -> defaults to raw explicit
297 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 self.assertEqual(1, len(a))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1273 self.assertEqual(480 * 640 * 3, len(a[0]))
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1274
539 ef41b62b456e updated DicomWEB tests for YBR images that are not transformed into RGB anymore Alain Mazy <am@osimis.io> parents: 537 diff changeset	1275 # Orthanc is now returning the YBR image instead of the RGB
543 8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1276 # TODO
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1277 # # starting from X.XX.X, Orthanc won't convert YBR to RGB anymore -> new checksum (https://discourse.orthanc-server.org/t/orthanc-convert-ybr-to-rgb-but-does-not-change-metadata/3533)
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1278 # if IsOrthancVersionAbove(ORTHANC, 1, XX, 1) and not HasGdcmPlugin(ORTHANC):
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1279 # # GetMaxImageDifference does not work with YBR images -> strict comparison with the output of dcmdjpeg
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1280 # self.assertEqual('d4aacc6c7758c7c968a4fc8d59b041d5', ComputeMD5(a[0]))
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1281 # else:
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1282 # http://effbot.org/zone/pil-comparing-images.htm
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1283 img = Image.frombytes('RGB', [ 640, 480 ], a[0])
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1284 self.assertLessEqual(GetMaxImageDifference(img, truthRGB), 2)
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1285
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1286 ACCEPT2 = copy.deepcopy(ACCEPT)
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1287 if HasGdcmPlugin(ORTHANC):
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1288 IS_GDCM = True
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1289 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	1290 del ACCEPT2['1.2.840.10008.1.2']
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1291 else:
539 ef41b62b456e updated DicomWEB tests for YBR images that are not transformed into RGB anymore Alain Mazy <am@osimis.io> parents: 537 diff changeset	1292 if not IsOrthancVersionAbove(ORTHANC, 1, 12, 1):
ef41b62b456e updated DicomWEB tests for YBR images that are not transformed into RGB anymore Alain Mazy <am@osimis.io> parents: 537 diff changeset	1293 self.assertEqual('dfdc79f5070926bbb8ac079ee91f5b91', ComputeMD5(a[0]))
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1294 IS_GDCM = False
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1295
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1296 a = DoGetMultipart(ORTHANC, '%s/frames/1' % uri,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1297 headers = { 'Accept' : ACCEPT2['1.2.840.10008.1.2.1'] })
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1298 self.assertEqual(1, len(a))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1299 self.assertEqual(480 * 640 * 3, len(a[0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1300
543 8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1301 # TODO
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1302 # # starting from X.XX.X, Orthanc won't convert YBR to RGB anymore -> new checksum (https://discourse.orthanc-server.org/t/orthanc-convert-ybr-to-rgb-but-does-not-change-metadata/3533)
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1303 # if IsOrthancVersionAbove(ORTHANC, 1, XX, X) and not HasGdcmPlugin(ORTHANC):
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1304 # # GetMaxImageDifference does not work with YBR images -> strict comparison with the output of dcmdjpeg
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1305 # self.assertEqual('d4aacc6c7758c7c968a4fc8d59b041d5', ComputeMD5(a[0]))
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1306 # else:
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1307 # http://effbot.org/zone/pil-comparing-images.htm
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1308 img = Image.frombytes('RGB', [ 640, 480 ], a[0])
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1309 self.assertLessEqual(GetMaxImageDifference(img, truthRGB), 2)
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1310
543 8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1311 # TODO: if not IS_GDCM and not IsOrthancVersionAbove(ORTHANC, 1, XX, X):
8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 539 diff changeset	1312 if not IS_GDCM:
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1313 self.assertEqual('dfdc79f5070926bbb8ac079ee91f5b91', ComputeMD5(a[0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1314
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1315
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1316 # Test download using the same transfer syntax
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1317 RESULTS = {
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1318 '1.2.840.10008.1.2' : 'f54c7ea520ab3ec32b6303581ecd262f',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1319 '1.2.840.10008.1.2.1' : '4b350b9353a93c747917c7c3bf9b8f44',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1320 '1.2.840.10008.1.2.4.50' : '142fdb8a1dc2aa7e6b8952aa294a6e22',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1321 '1.2.840.10008.1.2.4.51' : '8b37945d75f9d2899ed868bdba429a0d',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1322 '1.2.840.10008.1.2.4.57' : '75c84823eddb560d127b1d24c9406f30',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1323 '1.2.840.10008.1.2.4.70' : '2c35726328f0200396e583a0038b0269',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1324 }
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1325
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1326 if IS_GDCM:
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1327 # 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	1328 # 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	1329 #RESULTS['1.2.840.10008.1.2.4.51'] = '901963a322a817946b074f9ed0afa060'
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1330 pass
b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 303 diff changeset	1331
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1332 for syntax in ACCEPT2:
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1333 uri = '/dicom-web%s' % UploadAndGetWadoPath('TransferSyntaxes/%s.dcm' % syntax)
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1334 a = DoGetMultipart(ORTHANC, '%s/frames/1' % uri,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1335 headers = { 'Accept' : ACCEPT2[syntax] })
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1336 self.assertEqual(1, len(a))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1337 self.assertEqual(RESULTS[syntax], ComputeMD5(a[0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1338
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1339 # 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	1340 uri = 'dicom-web%s' % UploadAndGetWadoPath('KarstenHilbertRF.dcm')
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1341 for syntax in ACCEPT2:
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1342 a = DoGetMultipart(ORTHANC, '%s/frames/1' % uri,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1343 headers = { 'Accept' : ACCEPT2[syntax] },
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1344 returnHeaders = True)
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1345 self.assertEqual(1, len(a))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1346 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	1347 self.assertEqual('%s%s/frames/1' % (ORTHANC['Url'], uri),
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1348 a[0][1]['Content-Location'])
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1349 self.assertEqual(ACCEPT[syntax],
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1350 'multipart/related; type=%s' % a[0][1]['Content-Type'])
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1351 if IS_GDCM:
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1352 self.assertEqual({
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1353 '1.2.840.10008.1.2' : '1c8cebde0c74450ce4dfb75dd52ddad7',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1354 '1.2.840.10008.1.2.1' : '1c8cebde0c74450ce4dfb75dd52ddad7',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1355 '1.2.840.10008.1.2.4.50' : 'f4d145e5f33fbd39375ce0f91453d6cc',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1356 '1.2.840.10008.1.2.4.51' : 'f4d145e5f33fbd39375ce0f91453d6cc',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1357 '1.2.840.10008.1.2.4.57' : 'dc55800ce1a8ac556c266cdb26d75757',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1358 '1.2.840.10008.1.2.4.70' : 'dc55800ce1a8ac556c266cdb26d75757',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1359 } [syntax], ComputeMD5(a[0][0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1360 else:
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1361 self.assertEqual({
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1362 '1.2.840.10008.1.2' : '1c8cebde0c74450ce4dfb75dd52ddad7',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1363 '1.2.840.10008.1.2.1' : '1c8cebde0c74450ce4dfb75dd52ddad7',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1364 '1.2.840.10008.1.2.4.50' : '0a0ab74fe7c68529bdd416fc9e5e742a',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1365 '1.2.840.10008.1.2.4.51' : '33d1ab2fe169c5b5ba932a9bbc3c6306',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1366 '1.2.840.10008.1.2.4.57' : '3d21c969da846ca41e0498a0dcfad061',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1367 '1.2.840.10008.1.2.4.70' : '49d5353c8673208629847ad45a855557',
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1368 } [syntax], ComputeMD5(a[0][0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1369
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1370
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1371 # JPEG image with many fragments for 2 frames
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1372 uri = '/dicom-web%s' % UploadAndGetWadoPath('LenaTwiceWithFragments.dcm')
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1373
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1374 a = DoGetMultipart(ORTHANC, '%s/frames/1' % uri,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1375 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	1376 self.assertEqual(1, len(a))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1377 self.assertEqual(69214, len(a[0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1378 self.assertEqual('0eaf36d4881c513ca70b6684bfaa5b08', ComputeMD5(a[0]))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1379
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1380 b = DoGetMultipart(ORTHANC, '%s/frames/2' % uri,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1381 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	1382 self.assertEqual(1, len(b))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1383 self.assertEqual(a[0], b[0])
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1384
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1385 b = DoGetMultipart(ORTHANC, '%s/frames/1,2' % uri,
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1386 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	1387 self.assertEqual(2, len(b))
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1388 self.assertEqual(a[0], b[0])
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1389 self.assertEqual(a[0], b[1])
f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1390
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1391
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1392 def test_wado_transcoding(self):
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1393 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	1394
367 9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1395 compressedSize = os.path.getsize(GetDatabasePath('TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm'))
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1396
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1397 self.assertRaises(Exception, lambda: DoGetMultipart(ORTHANC, '%s' % uri,
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1398 headers = { 'Accept' : 'nope' }))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1399
367 9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1400 # Up to release 1.5 of the DICOMweb plugin, if no
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1401 # transfer-syntax was specified, no transcoding occured. This
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1402 # was because of an undefined behavior up to DICOM
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1403 # 2016b. Starting with DICOM 2016c, the standard explicitly
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1404 # states that the image should be transcoded to Little Endian
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1405 # Explicit.
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1406 a = DoGetMultipart(ORTHANC, '%s' % uri,
367 9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1407 headers = { })
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1408 self.assertEqual(1, len(a))
367 9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1409 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(a[0]))
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1410 self.assertTrue(10 * compressedSize < len(a[0]))
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1411 uncompressedSize = len(a[0])
297 f95cd3af1c7a DICOMweb: test_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 284 diff changeset	1412
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1413 a = DoGetMultipart(ORTHANC, '%s' % uri,
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1414 headers = { 'Accept' : 'multipart/related' })
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1415 self.assertEqual(1, len(a))
367 9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1416 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(a[0]))
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1417 self.assertEqual(uncompressedSize, len(a[0]))
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1418
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1419 a = DoGetMultipart(ORTHANC, '%s' % uri,
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1420 headers = { 'Accept' : 'multipart/related; type=application/dicom' })
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1421 self.assertEqual(1, len(a))
367 9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1422 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(a[0]))
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1423 self.assertEqual(uncompressedSize, len(a[0]))
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1424
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1425 a = DoGetMultipart(ORTHANC, '%s' % uri,
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1426 headers = { 'Accept' : 'multipart/related; type=application/dicom; transfer-syntax=*' })
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1427 self.assertEqual(1, len(a))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1428 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(a[0]))
367 9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1429 self.assertEqual(compressedSize, len(a[0]))
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1430
367 9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1431 # Use source transfer syntax
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1432 a = DoGetMultipart(ORTHANC, '%s' % uri,
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1433 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	1434 self.assertEqual(1, len(a))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1435 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(a[0]))
367 9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1436 self.assertEqual(compressedSize, len(a[0]))
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1437
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1438 a = DoGetMultipart(ORTHANC, '%s' % uri,
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1439 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	1440 self.assertEqual(1, len(a))
bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	1441 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(a[0]))
367 9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1442 self.assertEqual(uncompressedSize, len(a[0]))
325 b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1443
367 9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1444 # Transcoding
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1445 a = DoGetMultipart(ORTHANC, '%s' % uri,
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1446 headers = { 'Accept' : 'multipart/related; type=application/dicom; transfer-syntax=1.2.840.10008.1.2.4.57' })
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1447 self.assertEqual(1, len(a))
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1448 self.assertEqual('1.2.840.10008.1.2.4.57', GetTransferSyntax(a[0]))
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1449 self.assertNotEqual(compressedSize, len(a[0]))
9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1450 self.assertNotEqual(uncompressedSize, len(a[0]))
325 b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1451
367 9d2a63afdb73 Test compliance with DICOM >= 2016c: WADO-RS Retrieve transcodes to Little Endian Explicit by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	1452
325 b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1453 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	1454 # 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	1455
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1456 # 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	1457 # $ 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	1458 # 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	1459
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1460 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	1461 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	1462 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	1463 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	1464
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1465 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	1466 truth = UncompressImage(f.read())
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1467
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1468 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	1469 self.assertEqual('JPEG', im1.format)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1470
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1471 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	1472 self.assertEqual('PNG', im2.format)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1473
434 2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1474 im3 = GetImage(ORTHANC, '/dicom-web/studies/%s/series/%s/instances/%s/frames/1/rendered?window=200,800,linear' % (STUDY, SERIES, INSTANCE))
325 b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1475 self.assertEqual('JPEG', im3.format)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1476
434 2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1477 im4 = GetImage(ORTHANC, '/dicom-web/studies/%s/series/%s/instances/%s/rendered?window=200,800,linear' % (STUDY, SERIES, INSTANCE),
325 b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1478 headers = { 'Accept' : 'image/png' })
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1479 self.assertEqual('PNG', im4.format)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1480
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1481 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	1482 self.assertEqual('JPEG', im5.format)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1483
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1484 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	1485 self.assertEqual('PNG', im6.format)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1486
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1487 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	1488 self.assertEqual('L', im.mode)
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1489 self.assertEqual(512, im.size[0])
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1490 self.assertEqual(512, im.size[1])
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1491
b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1492 # 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	1493 # 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	1494 # http://effbot.org/zone/pil-comparing-images.htm
434 2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1495 self.assertLess(ImageChops.difference(im1, im3).getextrema() [1], 10)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1496 self.assertLess(ImageChops.difference(im2, im4).getextrema() [1], 2)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1497 self.assertLess(ImageChops.difference(im3, im5).getextrema() [1], 10)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1498 self.assertLess(ImageChops.difference(im4, im6).getextrema() [1], 2)
325 b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1499 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	1500 self.assertTrue(ImageChops.difference(im2, im6).getbbox() is None)
345 4d3b797aa5ae fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 325 diff changeset	1501
4d3b797aa5ae fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 325 diff changeset	1502 bbox = ImageChops.difference(im2, truth).getbbox()
346 a56cbcbacfde fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 345 diff changeset	1503 if bbox != None:
a56cbcbacfde fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 345 diff changeset	1504 # Tolerance of just 1 pixel of difference (needed on Windows)
a56cbcbacfde fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 345 diff changeset	1505 #print(im2.getpixel((238,275))) # => 255
a56cbcbacfde fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 345 diff changeset	1506 #print(truth.getpixel((238,275))) # => 254
a56cbcbacfde fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 345 diff changeset	1507 self.assertLessEqual(abs(bbox[2] - bbox[0]), 1)
a56cbcbacfde fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 345 diff changeset	1508 self.assertLessEqual(abs(bbox[3] - bbox[1]), 1)
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1509
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1510
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1511 def test_issue_195(self):
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1512 # This fails on Orthanc <= 1.9.2
588 8aa101e126d0 migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 586 diff changeset	1513 # https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=195
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1514 a = UploadInstance(ORTHANC, 'Issue195.dcm') ['ID']
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1515 b = DoGet(ORTHANC, 'dicom-web/studies/1.2.276.0.7230010.3.1.2.8323329.13188.1620309604.848733/series/1.2.276.0.7230010.3.1.3.8323329.13188.1620309604.848734/instances/1.2.276.0.7230010.3.1.4.8323329.13188.1620309604.848735/metadata',
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1516 headers = { 'Accept' : 'application/dicom+json' })
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1517
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1518 self.assertEqual(1, len(b))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1519 self.assertEqual(5, len(b[0]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1520
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1521 # The expected result can be found by typing "dcm2json Database/Issue195.dcm"
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1522 self.assertEqual(2, len(b[0]["00080018"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1523 self.assertEqual("UI", b[0]["00080018"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1524 self.assertEqual("1.2.276.0.7230010.3.1.4.8323329.13188.1620309604.848735",
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1525 b[0]["00080018"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1526
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1527 self.assertEqual(2, len(b[0]["0020000D"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1528 self.assertEqual("UI", b[0]["0020000D"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1529 self.assertEqual("1.2.276.0.7230010.3.1.2.8323329.13188.1620309604.848733",
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1530 b[0]["0020000D"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1531
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1532 self.assertEqual(2, len(b[0]["0020000E"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1533 self.assertEqual("UI", b[0]["0020000E"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1534 self.assertEqual("1.2.276.0.7230010.3.1.3.8323329.13188.1620309604.848734",
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1535 b[0]["0020000E"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1536
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1537 self.assertEqual(1, len(b[0]["00081030"])) # Case of an empty value
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1538 self.assertEqual("LO", b[0]["00081030"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1539
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1540 self.assertEqual(2, len(b[0]["0008103E"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1541 self.assertEqual("LO", b[0]["0008103E"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1542 self.assertEqual("Hello1", b[0]["0008103E"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1543
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1544
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1545 DoDelete(ORTHANC, 'instances/%s' % a)
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1546 a = UploadInstance(ORTHANC, 'Issue195-bis.dcm') ['ID']
434 2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1547 URI = 'dicom-web/studies/1.2.276.0.7230010.3.1.2.8323329.6792.1625504071.652468/series/1.2.276.0.7230010.3.1.3.8323329.6792.1625504071.652469/instances/1.2.276.0.7230010.3.1.4.8323329.6792.1625504071.652470'
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1548 b = DoGet(ORTHANC, '%s/metadata' % URI,
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1549 headers = { 'Accept' : 'application/dicom+json' })
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1550
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1551 self.assertEqual(1, len(b))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1552 self.assertEqual(5, len(b[0]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1553
434 2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1554 # The expected result can be found by typing "dcm2json ../../Database/Issue195-bis.dcm"
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1555 self.assertEqual(2, len(b[0]["00080018"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1556 self.assertEqual("UI", b[0]["00080018"]["vr"])
434 2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1557 self.assertEqual("1.2.276.0.7230010.3.1.4.8323329.6792.1625504071.652470",
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1558 b[0]["00080018"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1559
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1560 self.assertEqual(2, len(b[0]["0020000D"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1561 self.assertEqual("UI", b[0]["0020000D"]["vr"])
434 2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1562 self.assertEqual("1.2.276.0.7230010.3.1.2.8323329.6792.1625504071.652468",
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1563 b[0]["0020000D"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1564
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1565 self.assertEqual(2, len(b[0]["0020000E"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1566 self.assertEqual("UI", b[0]["0020000E"]["vr"])
434 2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1567 self.assertEqual("1.2.276.0.7230010.3.1.3.8323329.6792.1625504071.652469",
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1568 b[0]["0020000E"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1569
434 2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1570 self.assertEqual(2, len(b[0]["00084567"]))
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1571 self.assertEqual("UN", b[0]["00084567"]["vr"])
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1572 self.assertEqual('http://%s:%s%s' % (args.server, args.rest, '/%s/bulk/00084567' % URI),
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1573 b[0]["00084567"]["BulkDataURI"])
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1574
434 2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1575 c = DoGet(ORTHANC, '%s/bulk/00084567' % URI)
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1576 self.assertTrue('Content-Length: 2\r\n' in c)
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1577 index = c.find('\r\n\r\n')
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1578 self.assertEqual(0x42, ord(c[index + 4]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1579 self.assertEqual(0x00, ord(c[index + 5]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1580
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	1581 # Case of an empty value, fails in Orthanc <= 1.9.2 because of issue #195
434 2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1582 self.assertEqual(1, len(b[0]["00084565"]))
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1583 self.assertEqual("UN", b[0]["00084565"]["vr"])
325 b7c2fb8e1b57 DICOMweb: test_compare_wado_uri_and_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 321 diff changeset	1584
273 afcd550a9216 test_multiple_mime_accept_wado_rs Sebastien Jodogne <s.jodogne@gmail.com> parents: 272 diff changeset	1585
434 2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1586
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1587
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1588 def test_multiframe_windowing(self):
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1589 # Fixed in DICOMweb 1.7
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1590 def GetLinear(x, c, w):
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1591 # http://dicom.nema.org/MEDICAL/dicom/2019a/output/chtml/part03/sect_C.11.2.html#sect_C.11.2.1.2.1
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1592 ymin = 0.0
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1593 ymax = 255.0
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1594 if float(x) <= float(c) - 0.5 - (float(w) - 1.0) / 2.0:
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1595 return ymin
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1596 elif float(x) > float(c) - 0.5 + (float(w) - 1.0) / 2.0 :
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1597 return ymax
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1598 else:
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1599 return ((float(x) - (float(c) - 0.5)) / (float(w) - 1.0) + 0.5) * (ymax - ymin) + ymin
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1600
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1601 def GetLinearExact(x, c, w):
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1602 # http://dicom.nema.org/MEDICAL/dicom/2019a/output/chtml/part03/sect_C.11.2.html#sect_C.11.2.1.3.2
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1603 ymin = 0.0
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1604 ymax = 255.0
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1605 if float(x) <= float(c) - float(w) / 2.0:
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1606 return ymin
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1607 elif float(x) > float(c) + float(w) / 2.0:
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1608 return ymax
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1609 else:
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1610 return (float(x) - float(c)) / float(w) * (ymax- ymin) + ymin
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1611
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1612 def GetSigmoid(x, c, w):
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1613 # http://dicom.nema.org/MEDICAL/dicom/2019a/output/chtml/part03/sect_C.11.2.html#sect_C.11.2.1.3.1
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1614 ymin = 0.0
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1615 ymax = 255.0
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1616 return (ymax - ymin) / (1.0 + math.exp(-4 * (float(x) - float(c)) / float(w)))
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1617
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1618 self.assertAlmostEqual(GetLinear(10, 0, 100), 154.54545454545456)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1619 self.assertAlmostEqual(GetLinear(-1000, 2048, 4096), 0)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1620 self.assertAlmostEqual(GetLinear(5096, 2048, 4096), 255)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1621 self.assertAlmostEqual(GetLinear(333, 2048, 4096), 20.7362637362637)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1622 self.assertAlmostEqual(GetLinear(16, 127, 256), 17)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1623
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1624 self.assertAlmostEqual(GetLinearExact(-1000, 2048, 4096), 0)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1625 self.assertAlmostEqual(GetLinearExact(5096, 2048, 4096), 255)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1626 self.assertAlmostEqual(GetLinearExact(150, 127, 256), 22.91015625)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1627
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1628 self.assertAlmostEqual(GetSigmoid(150, 127, 256), 150.166728345797)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1629
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1630 UploadInstance(ORTHANC, 'MultiframeWindowing.dcm')
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1631 STUDY = '1.2.840.113619.2.176.2025.1499492.7391.1175285944.390'
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1632 SERIES = '1.2.840.113619.2.176.2025.1499492.7391.1175285944.394'
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1633 INSTANCE = '1.2.840.113619.2.176.2025.1499492.7040.1175286242.109'
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1634
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1635 im = GetImage(ORTHANC, '/dicom-web/studies/%s/series/%s/instances/%s/frames/1/rendered?window=127,256,linear' % (STUDY, SERIES, INSTANCE))
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1636 self.assertLessEqual(abs(GetLinear(0x00, 127, 256) - im.getpixel((0, 0))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1637 self.assertLessEqual(abs(GetLinear(0x10, 127, 256) - im.getpixel((1, 0))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1638 self.assertLessEqual(abs(GetLinear(0x20, 127, 256) - im.getpixel((0, 1))), 1.1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1639 self.assertLessEqual(abs(GetLinear(0x30, 127, 256) - im.getpixel((1, 1))), 1.1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1640
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1641 im = GetImage(ORTHANC, '/dicom-web/studies/%s/series/%s/instances/%s/frames/1/rendered?window=0,256,linear-exact' % (STUDY, SERIES, INSTANCE))
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1642 self.assertLessEqual(abs(GetLinearExact(0x00, 0, 256) - im.getpixel((0, 0))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1643 self.assertLessEqual(abs(GetLinearExact(0x10, 0, 256) - im.getpixel((1, 0))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1644 self.assertLessEqual(abs(GetLinearExact(0x20, 0, 256) - im.getpixel((0, 1))), 1.2)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1645 self.assertLessEqual(abs(GetLinearExact(0x30, 0, 256) - im.getpixel((1, 1))), 1.2)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1646
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1647 im = GetImage(ORTHANC, '/dicom-web/studies/%s/series/%s/instances/%s/frames/1/rendered?window=127,256,sigmoid' % (STUDY, SERIES, INSTANCE))
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1648 self.assertLessEqual(abs(GetSigmoid(0x00, 127, 256) - im.getpixel((0, 0))), 3)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1649 self.assertLessEqual(abs(GetSigmoid(0x10, 127, 256) - im.getpixel((1, 0))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1650 self.assertLessEqual(abs(GetSigmoid(0x20, 127, 256) - im.getpixel((0, 1))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1651 self.assertLessEqual(abs(GetSigmoid(0x30, 127, 256) - im.getpixel((1, 1))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1652
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1653 im = GetImage(ORTHANC, '/dicom-web/studies/%s/series/%s/instances/%s/frames/1/rendered?window=16,128,linear' % (STUDY, SERIES, INSTANCE))
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1654 self.assertLessEqual(abs(GetLinear(0x00, 16, 128) - im.getpixel((0, 0))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1655 self.assertLessEqual(abs(GetLinear(0x10, 16, 128) - im.getpixel((1, 0))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1656 self.assertLessEqual(abs(GetLinear(0x20, 16, 128) - im.getpixel((0, 1))), 2)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1657 self.assertLessEqual(abs(GetLinear(0x30, 16, 128) - im.getpixel((1, 1))), 2)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1658
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1659 im = GetImage(ORTHANC, '/dicom-web/studies/%s/series/%s/instances/%s/frames/2/rendered?window=127,256,linear' % (STUDY, SERIES, INSTANCE))
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1660 ri = 100.0
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1661 rs = 1.0
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1662 self.assertLessEqual(abs(GetLinear(0x00 * rs + ri, 127, 256) - im.getpixel((0, 0))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1663 self.assertLessEqual(abs(GetLinear(0x10 * rs + ri, 127, 256) - im.getpixel((1, 0))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1664 self.assertLessEqual(abs(GetLinear(0x20 * rs + ri, 127, 256) - im.getpixel((0, 1))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1665 self.assertLessEqual(abs(GetLinear(0x30 * rs + ri, 127, 256) - im.getpixel((1, 1))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1666
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1667 im = GetImage(ORTHANC, '/dicom-web/studies/%s/series/%s/instances/%s/frames/3/rendered?window=127,256,linear' % (STUDY, SERIES, INSTANCE))
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1668 ri = 0.0
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1669 rs = 2.0
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1670 self.assertLessEqual(abs(GetLinear(0x00 * rs + ri, 127, 256) - im.getpixel((0, 0))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1671 self.assertLessEqual(abs(GetLinear(0x10 * rs + ri, 127, 256) - im.getpixel((1, 0))), 1.1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1672 self.assertLessEqual(abs(GetLinear(0x20 * rs + ri, 127, 256) - im.getpixel((0, 1))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1673 self.assertLessEqual(abs(GetLinear(0x30 * rs + ri, 127, 256) - im.getpixel((1, 1))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1674
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1675 im = GetImage(ORTHANC, '/dicom-web/studies/%s/series/%s/instances/%s/frames/4/rendered?window=127,256,linear' % (STUDY, SERIES, INSTANCE))
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1676 ri = 100.0
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1677 rs = 2.0
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1678 self.assertLessEqual(abs(GetLinear(0x00 * rs + ri, 127, 256) - im.getpixel((0, 0))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1679 self.assertLessEqual(abs(GetLinear(0x10 * rs + ri, 127, 256) - im.getpixel((1, 0))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1680 self.assertLessEqual(abs(GetLinear(0x20 * rs + ri, 127, 256) - im.getpixel((0, 1))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1681 self.assertLessEqual(abs(GetLinear(0x30 * rs + ri, 127, 256) - im.getpixel((1, 1))), 1)
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1682
2c142e070f19 dicomweb: added test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	1683
532 f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1684 def test_forwarded_headers(self):
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1685 study = UploadInstance(ORTHANC, 'ColorTestImageJ.dcm')['ParentStudy']
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1686 studyId = DoGet(ORTHANC, '/studies/%s' % study)['MainDicomTags']['StudyInstanceUID']
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1687
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1688 m = DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % studyId)
533 c5291d97ed54 fix Alain Mazy <am@osimis.io> parents: 532 diff changeset	1689 self.assertIn(ORTHANC['Url'], m[0][u'7FE00010']['BulkDataURI'])
532 f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1690
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1691 m = DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % studyId, headers= {
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1692 'host': 'my-domain'
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1693 })
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1694 self.assertIn("http://my-domain/dicom-web", m[0][u'7FE00010']['BulkDataURI'])
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1695
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1696 m = DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % studyId, headers= {
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1697 'forwarded': 'host=my-domain;proto=https'
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1698 })
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1699 self.assertIn("https://my-domain/dicom-web", m[0][u'7FE00010']['BulkDataURI'])
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1700
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1701 if IsPluginVersionAbove(ORTHANC, "dicom-web", 1, 13, 1):
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1702 m = DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % studyId, headers= {
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1703 'X-Forwarded-Host': 'my-domain',
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1704 'X-Forwarded-Proto': 'https'
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1705 })
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1706 self.assertIn("https://my-domain/dicom-web", m[0][u'7FE00010']['BulkDataURI'])
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1707
f96c023ce523 dicom-web X-Forwarded headers Alain Mazy <am@osimis.io> parents: 511 diff changeset	1708
575 28fef24147fa test for new DicomWeb cache Alain Mazy <am@osimis.io> parents: 563 diff changeset	1709 def test_full_mode_cache(self):
28fef24147fa test for new DicomWeb cache Alain Mazy <am@osimis.io> parents: 563 diff changeset	1710 study = UploadInstance(ORTHANC, 'ColorTestImageJ.dcm')['ParentStudy']
28fef24147fa test for new DicomWeb cache Alain Mazy <am@osimis.io> parents: 563 diff changeset	1711 studyId = DoGet(ORTHANC, '/studies/%s' % study)['MainDicomTags']['StudyInstanceUID']
28fef24147fa test for new DicomWeb cache Alain Mazy <am@osimis.io> parents: 563 diff changeset	1712
28fef24147fa test for new DicomWeb cache Alain Mazy <am@osimis.io> parents: 563 diff changeset	1713 # wait for the StableSeries to happen to pre-compute the series/metadata
28fef24147fa test for new DicomWeb cache Alain Mazy <am@osimis.io> parents: 563 diff changeset	1714 time.sleep(4)
28fef24147fa test for new DicomWeb cache Alain Mazy <am@osimis.io> parents: 563 diff changeset	1715
28fef24147fa test for new DicomWeb cache Alain Mazy <am@osimis.io> parents: 563 diff changeset	1716 m = DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % studyId)
28fef24147fa test for new DicomWeb cache Alain Mazy <am@osimis.io> parents: 563 diff changeset	1717 self.assertIn(ORTHANC['Url'], m[0][u'7FE00010']['BulkDataURI'])
28fef24147fa test for new DicomWeb cache Alain Mazy <am@osimis.io> parents: 563 diff changeset	1718
28fef24147fa test for new DicomWeb cache Alain Mazy <am@osimis.io> parents: 563 diff changeset	1719
551 c8d2775f0d02 added test_issue_216 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 549 diff changeset	1720 def test_issue_216(self):
558 0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1721 study = UploadInstance(ORTHANC, 'ColorTestImageJ.dcm')['ParentStudy']
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1722 studyUid = DoGet(ORTHANC, '/studies/%s' % study)['MainDicomTags']['StudyInstanceUID']
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1723
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1724 m = DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % studyUid, headers = {
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1725 'accept': 'image/webp, /;q=0.8, text/html, application/xhtml+xml, application/xml;q=0.9'
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1726 })
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1727 self.assertEqual(1, len(m))
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1728 self.assertEqual(studyUid, m[0]['0020000D']['Value'][0])
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1729
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1730 m = DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % studyUid, headers = {
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1731 'accept': 'text/html, application/xhtml+xml, application/xml, image/webp, /;q=0.8'
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1732 })
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1733 self.assertEqual(1, len(m))
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1734 self.assertEqual(studyUid, m[0]['0020000D']['Value'][0])
551 c8d2775f0d02 added test_issue_216 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 549 diff changeset	1735
561 2c809c605592 conditional tests Alain Mazy <am@osimis.io> parents: 558 diff changeset	1736 if IsPluginVersionAbove(ORTHANC, "dicom-web", 1, 13, 1) and IsOrthancVersionAbove(ORTHANC, 1, 12, 1):
2c809c605592 conditional tests Alain Mazy <am@osimis.io> parents: 558 diff changeset	1737 # This fails on DICOMweb <= 1.13 because of the "; q=.2",
2c809c605592 conditional tests Alain Mazy <am@osimis.io> parents: 558 diff changeset	1738 # since multiple accepts were not supported
588 8aa101e126d0 migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 586 diff changeset	1739 # https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=216
561 2c809c605592 conditional tests Alain Mazy <am@osimis.io> parents: 558 diff changeset	1740 m = DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % studyUid, headers = {
2c809c605592 conditional tests Alain Mazy <am@osimis.io> parents: 558 diff changeset	1741 'accept': 'text/html, image/gif, image/jpeg, /; q=.2, /; q=.2'
2c809c605592 conditional tests Alain Mazy <am@osimis.io> parents: 558 diff changeset	1742 })
2c809c605592 conditional tests Alain Mazy <am@osimis.io> parents: 558 diff changeset	1743 self.assertEqual(1, len(m))
2c809c605592 conditional tests Alain Mazy <am@osimis.io> parents: 558 diff changeset	1744 self.assertEqual(studyUid, m[0]['0020000D']['Value'][0])
551 c8d2775f0d02 added test_issue_216 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 549 diff changeset	1745
561 2c809c605592 conditional tests Alain Mazy <am@osimis.io> parents: 558 diff changeset	1746 # This fails on Orthanc <= 1.12.0 because of the ";q=0.9"
2c809c605592 conditional tests Alain Mazy <am@osimis.io> parents: 558 diff changeset	1747 m = DoGet(ORTHANC, '/dicom-web/studies/%s/metadata' % studyUid, headers = {
2c809c605592 conditional tests Alain Mazy <am@osimis.io> parents: 558 diff changeset	1748 'accept': 'text/html, application/xhtml+xml, application/xml;q=0.9, image/webp, /;q=0.8'
2c809c605592 conditional tests Alain Mazy <am@osimis.io> parents: 558 diff changeset	1749 })
2c809c605592 conditional tests Alain Mazy <am@osimis.io> parents: 558 diff changeset	1750 self.assertEqual(1, len(m))
2c809c605592 conditional tests Alain Mazy <am@osimis.io> parents: 558 diff changeset	1751 self.assertEqual(studyUid, m[0]['0020000D']['Value'][0])
558 0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1752
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1753
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1754 def test_accept_negotiation(self):
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1755 def CheckBadRequest(uri, accept):
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1756 response = DoGetRaw(ORTHANC, uri, headers = {
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1757 'accept': accept
552 71096a3e3006 test orthanc version Alain Mazy <am@osimis.io> parents: 551 diff changeset	1758 })
558 0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1759 self.assertEqual(int(response[0]['status']), 400)
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1760
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1761 def CheckIsJson(uri, accept):
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1762 if accept != None:
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1763 response = DoGetRaw(ORTHANC, uri, headers = {
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1764 'accept': accept
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1765 })
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1766 else:
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1767 response = DoGetRaw(ORTHANC, uri)
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1768 self.assertEqual(int(response[0]['status']), 200)
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1769 self.assertEqual(response[0]['content-type'], 'application/dicom+json')
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1770 json.loads(response[1])
551 c8d2775f0d02 added test_issue_216 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 549 diff changeset	1771
558 0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1772 def CheckIsXml(uri, accept):
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1773 response = DoGetMultipart(ORTHANC, uri, headers = {
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1774 'accept': accept
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1775 }, returnHeaders = True)
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1776 self.assertEqual(1, len(response))
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1777 self.assertEqual(2, len(response[0]))
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1778 self.assertEqual('application/dicom+xml', response[0][1]['Content-Type'])
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1779 xml.dom.minidom.parseString(response[0][0])
552 71096a3e3006 test orthanc version Alain Mazy <am@osimis.io> parents: 551 diff changeset	1780
559 87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1781 def CheckIsDicom(uri, accept):
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1782 if accept != None:
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1783 response = DoGetMultipart(ORTHANC, uri, headers = {
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1784 'accept': accept
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1785 }, returnHeaders = True)
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1786 else:
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1787 response = DoGetMultipart(ORTHANC, uri, returnHeaders = True)
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1788 self.assertEqual(1, len(response))
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1789 self.assertEqual(2, len(response[0]))
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1790 self.assertEqual('application/dicom', response[0][1]['Content-Type'])
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1791 pydicom.dcmread(BytesIO(response[0][0]), force=True)
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1792
560 2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1793 def CheckIsBulk(uri, accept):
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1794 if accept != None:
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1795 response = DoGetMultipart(ORTHANC, uri, headers = {
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1796 'accept': accept
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1797 }, returnHeaders = True)
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1798 else:
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1799 response = DoGetMultipart(ORTHANC, uri, returnHeaders = True)
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1800 self.assertEqual(1, len(response))
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1801 self.assertEqual(2, len(response[0]))
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1802 self.assertEqual('application/octet-stream', response[0][1]['Content-Type'])
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1803 self.assertTrue(len(response[0][0]) > 1)
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1804
558 0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1805 study = UploadInstance(ORTHANC, 'ColorTestImageJ.dcm')['ParentStudy']
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1806 studyUid = DoGet(ORTHANC, '/studies/%s' % study)['MainDicomTags']['StudyInstanceUID']
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1807
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1808 CheckIsJson('/dicom-web/studies/%s/metadata' % studyUid, None)
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1809 CheckBadRequest('/dicom-web/studies/%s/metadata' % studyUid, 'application/nope')
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1810 CheckIsJson('/dicom-web/studies/%s/metadata' % studyUid, 'application/json')
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1811 CheckIsJson('/dicom-web/studies/%s/metadata' % studyUid, 'application/dicom+json')
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1812 CheckBadRequest('/dicom-web/studies/%s/metadata' % studyUid, 'multipart/related')
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1813 CheckIsXml('/dicom-web/studies/%s/metadata' % studyUid, 'multipart/related; type=application/dicom+xml')
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1814 CheckIsXml('/dicom-web/studies/%s/metadata' % studyUid, 'multipart/related; type="application/dicom+xml"')
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1815 CheckBadRequest('/dicom-web/studies/%s/metadata' % studyUid, 'multipart/related; type="application/nope"')
0ad170c7b6c8 reactivation of test_issue_216, as the fix is now in the mainline Sebastien Jodogne <s.jodogne@gmail.com> parents: 555 diff changeset	1816 CheckBadRequest('/dicom-web/studies/%s/metadata' % studyUid, 'multipart/related; type=application/dicom+xml; transfer-syntax=nope')
551 c8d2775f0d02 added test_issue_216 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 549 diff changeset	1817
559 87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1818 CheckBadRequest('/dicom-web/studies/%s' % studyUid, 'multipart/nope')
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1819 CheckIsDicom('/dicom-web/studies/%s' % studyUid, None)
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1820 CheckIsDicom('/dicom-web/studies/%s' % studyUid, 'multipart/related')
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1821 CheckIsDicom('/dicom-web/studies/%s' % studyUid, 'multipart/related; type=application/dicom')
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1822 CheckIsDicom('/dicom-web/studies/%s' % studyUid, 'multipart/related; type="application/dicom"')
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1823 CheckBadRequest('/dicom-web/studies/%s' % studyUid, 'multipart/related; type=application/nope')
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1824 CheckIsDicom('/dicom-web/studies/%s' % studyUid, 'multipart/related; transfer-syntax=*')
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1825 CheckIsDicom('/dicom-web/studies/%s' % studyUid, 'multipart/related; type=application/dicom; transfer-syntax=*')
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1826 CheckBadRequest('/dicom-web/studies/%s' % studyUid, 'multipart/related; transfer-syntax=nope')
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1827 CheckIsDicom('/dicom-web/studies/%s' % studyUid, 'multipart/related; type=application/dicom; transfer-syntax=1.2.840.10008.1.2.1')
87fc87897e7e test_accept_negotiation for multipart DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 558 diff changeset	1828
560 2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1829 uri = '/dicom-web/studies/%s/series/%s/instances/%s/bulk/0010,0010' % (
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1830 studyUid, '1.3.12.2.1107.5.99.2.1255.30000007020811545343700000012',
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1831 '1.2.276.0.7230010.3.1.4.2455711835.6056.1170936079.1')
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1832 CheckIsBulk(uri, None)
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1833 CheckBadRequest(uri, 'multipart/nope')
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1834 CheckIsBulk(uri, 'multipart/related')
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1835 CheckIsBulk(uri, 'multipart/related;type=application/octet-stream')
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1836 CheckIsBulk(uri, 'multipart/related; type = "application/octet-stream" ')
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1837 CheckBadRequest(uri, 'multipart/related; type = " application/octet-stream" ')
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1838 CheckBadRequest(uri, 'multipart/related;type=application/nope')
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1839 CheckBadRequest(uri, 'multipart/related;range=')
2db7a9041507 test bulk data negotiation Sebastien Jodogne <s.jodogne@gmail.com> parents: 559 diff changeset	1840
551 c8d2775f0d02 added test_issue_216 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 549 diff changeset	1841
32 682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1842 try:
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1843 print('\nStarting the tests...')
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1844 unittest.main(argv = [ sys.argv[0] ] + args.options)
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1845
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1846 finally:
682c4e2a1162 integration tests for wado Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1847 print('\nDone')

Mercurial > hg > orthanc-tests

annotate Plugins/DicomWeb/Run.py @ 608:ba06331ac8dd