Mercurial > hg > orthanc-tests

annotate Plugins/Worklists/Run.py @ 612:575aa420f866

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix worklist tests for python2
author Alain Mazy <am@osimis.io>
date Thu, 01 Feb 2024 09:41:57 +0100
parents a8e49d30f634
children 88539de02bcc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
609
a8e49d30f634 compatibility of Plugins/Worklists/Run.py with python 3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 536
diff changeset
1 #!/usr/bin/python3
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
2 # -*- coding: utf-8 -*-
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
3
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 # Orthanc - A Lightweight, RESTful DICOM Store
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
afbac3eb28a5 integration tests of worklists
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: 449
diff changeset
8 # Copyright (C) 2017-2023 Osimis S.A., Belgium
933fe1bbce4f upgrade to year 2023
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 449
diff changeset
9 # Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 #
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 # This program is free software: you can redistribute it and/or
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 # modify it under the terms of the GNU General Public License as
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 # published by the Free Software Foundation, either version 3 of the
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 # License, or (at your option) any later version.
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 #
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 # This program is distributed in the hope that it will be useful, but
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 # WITHOUT ANY WARRANTY; without even the implied warranty of
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 # General Public License for more details.
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 #
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 # You should have received a copy of the GNU General Public License
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 # along with this program. If not, see <http://www.gnu.org/licenses/>.
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 import argparse
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 import os
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 import pprint
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 import re
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 import subprocess
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 import sys
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 import tempfile
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 import unittest
109
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
33 from shutil import copyfile
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'Tests'))
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 from Toolbox import *
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 ##
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 ## Parse the command-line arguments
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 ##
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 parser = argparse.ArgumentParser(description = 'Run the integration tests for the DICOM worklist plugin.')
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 parser.add_argument('--server',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 default = 'localhost',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 help = 'Address of the Orthanc server to test')
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
48 parser.add_argument('--rest',
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
49 type = int,
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
50 default = 8042,
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
51 help = 'Port to the REST API')
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
52 parser.add_argument('--username',
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
53 default = 'alice',
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
54 help = 'Username to the REST API')
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
55 parser.add_argument('--password',
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
56 default = 'orthanctest',
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
57 help = 'Password to the REST API')
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 parser.add_argument('--dicom',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 type = int,
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 default = 4242,
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 help = 'DICOM port of the Orthanc instance to test')
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 parser.add_argument('options', metavar = 'N', nargs = '*',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 help='Arguments to Python unittest')
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 args = parser.parse_args()
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
69 ORTHANC = DefineOrthanc(server = args.server,
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
70 username = args.username,
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
71 password = args.password,
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
72 restPort = args.rest)
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
73
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
74
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
75
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 ##
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 ## Toolbox
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 ##
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 DATABASE = os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(__file__), '..', '..', 'Database', 'Worklists')))
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 WORKING = os.path.join(DATABASE, 'Working')
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
83 print('Database directory: %s' % DATABASE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
84 print('Working directory: %s' % WORKING)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
85
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 try:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 os.mkdir(WORKING)
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 except Exception as e:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 # The working folder has already been created
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 pass
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 def ClearDatabase():
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 for f in os.listdir(WORKING):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 if f != 'lockfile':
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 os.remove(os.path.join(WORKING, f))
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96
109
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
97 def AddToDatabase(worklist):
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
98 extension = os.path.splitext(worklist)[1].lower()
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
99 source = os.path.join(DATABASE, worklist)
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
100 target = os.path.join(WORKING, os.path.basename(worklist) + '.wl')
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
101
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
102 if extension == '.dump':
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
103 subprocess.check_call([ 'dump2dcm', '--write-xfer-little', source, target ])
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
104 else:
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
105 copyfile(source, target)
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
106
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 def RunQuery(source, ignoreTags):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 with tempfile.NamedTemporaryFile() as f:
93
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
110 subprocess.check_call([ 'dump2dcm', '--write-xfer-little',
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 os.path.join(DATABASE, source), f.name ])
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 a = subprocess.check_output([ 'findscu', '-v', '--call', 'ORTHANC', '-aet', 'ORTHANCTEST',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 args.server, str(args.dicom), f.name ],
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 stderr = subprocess.STDOUT).splitlines()
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116
612
575aa420f866 fix worklist tests for python2
Alain Mazy <am@osimis.io>
parents: 609
diff changeset
117 if sys.version_info.major == 2:
575aa420f866 fix worklist tests for python2
Alain Mazy <am@osimis.io>
parents: 609
diff changeset
118 if len(list(filter(lambda x: x.startswith('E:'), a))) > 0:
575aa420f866 fix worklist tests for python2
Alain Mazy <am@osimis.io>
parents: 609
diff changeset
119 raise Exception('Error while running findscu')
575aa420f866 fix worklist tests for python2
Alain Mazy <am@osimis.io>
parents: 609
diff changeset
120 else:
575aa420f866 fix worklist tests for python2
Alain Mazy <am@osimis.io>
parents: 609
diff changeset
121 # pprint.pprint(a)
575aa420f866 fix worklist tests for python2
Alain Mazy <am@osimis.io>
parents: 609
diff changeset
122 a = list(map(lambda x: x.decode('utf-8', errors="ignore"), a))
575aa420f866 fix worklist tests for python2
Alain Mazy <am@osimis.io>
parents: 609
diff changeset
123 # pprint.pprint(a)
609
a8e49d30f634 compatibility of Plugins/Worklists/Run.py with python 3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 536
diff changeset
124
612
575aa420f866 fix worklist tests for python2
Alain Mazy <am@osimis.io>
parents: 609
diff changeset
125 if len(list(filter(lambda x: x.startswith('E:'), a))) > 0:
575aa420f866 fix worklist tests for python2
Alain Mazy <am@osimis.io>
parents: 609
diff changeset
126 raise Exception('Error while running findscu')
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
128 b = map(lambda x: x[3:], filter(lambda x: (x.startswith('I: ---') or
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
129 x.startswith('W: ---') or
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
130 x.startswith('I: (') or
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
131 x.startswith('W: (')), a))
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 b = map(lambda x: re.sub(r'\s*#.*', '', x), b)
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 answers = []
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 current = []
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
136 isQuery = True
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 for l in b:
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
139 l = l.replace('\0', '')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
140
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 if l[0] == '-':
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
142 if isQuery:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
143 isQuery = False
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
144 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
145 # This is a separator between DICOM datasets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
146 if len(current) > 0:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
147 answers.append(current)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
148 current = []
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 else:
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
151 if not isQuery:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
152 tag = l[1:10].lower()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
153 if not tag in ignoreTags:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
154 current.append(l)
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 if len(current) > 0:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 answers.append(current)
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 return answers
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 def CompareAnswers(expected, actual):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 if len(expected) != len(actual):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 return False
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165 if len(expected) == 0:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166 return True
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 for i in range(len(expected)):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 for j in range(len(actual)):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 if expected[i] == actual[j]:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171 return True
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 return False
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
176 def ParseTopLevelTags(answer):
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
177 tags = {}
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
178 for line in answer:
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
179 m = re.match(r'^\(([0-9a-f]{4},[0-9a-f]{4})\)\s*..\s*\[([^]]*)\]', line)
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
180 tags[m.group(1)] = m.group(2).strip()
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
181
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
182 return tags
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
183
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
184
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 ##
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186 ## The tests
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 ##
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 class Orthanc(unittest.TestCase):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 def setUp(self):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 if (sys.version_info >= (3, 0)):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192 # Remove annoying warnings about unclosed socket in Python 3
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 import warnings
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 warnings.simplefilter("ignore", ResourceWarning)
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 ClearDatabase()
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
197 DoPost(ORTHANC, '/tools/execute-script', 'function IncomingWorklistRequestFilter(query, origin) return query end', 'application/lua')
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 def test_single(self):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 for db in range(1, 11):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 ClearDatabase()
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
203 AddToDatabase('Dcmtk/Database/wklist%d.dump' % db)
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205 for query in range(0, 13):
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
206 answers = RunQuery('Dcmtk/Queries/wlistqry%d.dump' % query, [
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207 '0008,0005',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208 '0040,0004',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
209 '0040,0005',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
210 '0040,0020',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
211 ])
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
212
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
213 with open(os.path.join('%s/Dcmtk/Expected/single-%d-%d.json' % (DATABASE, db, query)), 'r') as f:
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214 expected = json.loads(f.read())
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
215 self.assertTrue(CompareAnswers(expected, answers))
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
216
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
217
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
218 def test_all(self):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
219 ClearDatabase()
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
220
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
221 for db in range(1, 11):
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
222 AddToDatabase('Dcmtk/Database/wklist%d.dump' % db)
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
224 for query in range(0, 13):
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
225 answers = RunQuery('Dcmtk/Queries/wlistqry%d.dump' % query, [
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226 '0008,0005',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
227 '0040,0004',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
228 '0040,0005',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
229 '0040,0020',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
230 ])
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
231
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
232 with open(os.path.join('%s/Dcmtk/Expected/all-%d.json' % (DATABASE, query)), 'r') as f:
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
233 expected = json.loads(f.read())
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
234 self.assertTrue(CompareAnswers(expected, answers))
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
235
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
236
93
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
237 def test_vet(self):
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
238 AddToDatabase('Sequences/STATION_AET/orig.7705.dump')
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
239 AddToDatabase('Sequences/STATION_AET/orig.7814.dump')
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
240 AddToDatabase('Sequences/STATION_AET/orig.7814.without.seq.dump')
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
241
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
242 self.assertEqual(2, len(RunQuery('Sequences/Queries/7814.without.length.dump', [])))
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
243 self.assertEqual(2, len(RunQuery('Sequences/Queries/7814.without.seq.dump', [])))
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
244 self.assertEqual(2, len(RunQuery('Sequences/Queries/orig.7814.dump', [])))
97
c39520dacdd7 test_other_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
245
536
6546ca088276 new tests for private creator in worklists
Alain Mazy <am@osimis.io>
parents: 511
diff changeset
246 def test_private_creator(self):
6546ca088276 new tests for private creator in worklists
Alain Mazy <am@osimis.io>
parents: 511
diff changeset
247 AddToDatabase('private-creator-wl.dump')
6546ca088276 new tests for private creator in worklists
Alain Mazy <am@osimis.io>
parents: 511
diff changeset
248
6546ca088276 new tests for private creator in worklists
Alain Mazy <am@osimis.io>
parents: 511
diff changeset
249 self.assertEqual(1, len(RunQuery('private-creator-query.dump', [])))
6546ca088276 new tests for private creator in worklists
Alain Mazy <am@osimis.io>
parents: 511
diff changeset
250
97
c39520dacdd7 test_other_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
251
98
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
252 @unittest.skip("This test requires to enable option 'FilterIssuerAet' in the sample worklist plugin")
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
253 def test_filter_issuer_aet(self):
97
c39520dacdd7 test_other_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
254 AddToDatabase('Sequences/STATION_AET/orig.7814.dump')
98
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
255 AddToDatabase('Sequences/STATION_AET/orig.7814.other.station.dump')
97
c39520dacdd7 test_other_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
256
98
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
257 self.assertEqual(1, len(RunQuery('Sequences/Queries/7814.without.station.aet.dump', [])))
93
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
258
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
259 def test_filter_issuer_aet_from_lua(self):
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
260 AddToDatabase('Sequences/STATION_AET/orig.7814.dump') # targeted at STATION_AET
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
261 AddToDatabase('Sequences/STATION_AET/orig.7814.other.station.dump') # targeted at ORTHANC_TEST
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
262
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
263 self.assertEqual(2, len(RunQuery('Sequences/Queries/7814.without.station.aet.dump', []))) # query is not targeting any station -> match all
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
264 InstallLuaScript(ORTHANC, "\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
265 function IncomingWorklistRequestFilter(query, origin)\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
266 query['0040,0100'][1]['0040,0001'] = origin['RemoteAet']\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
267 return query\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
268 end");
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
269
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
270 self.assertEqual(1, len(RunQuery('Sequences/Queries/7814.without.station.aet.dump', []))) # now, query is targeting ORTHANCTEST -> match one
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
271
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
272
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
273 def test_remove_aet_from_query(self):
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
274 AddToDatabase('Sequences/NO_STATION_AET/orig.7814.other.station.dump') # targeted at ORTHANCTEST
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
275
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
276 self.assertEqual(0, len(RunQuery('Sequences/Queries/orig.7814.dump', []))) # query is targeting STATION_AET -> will not match
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
277 InstallLuaScript(ORTHANC, "\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
278 function IncomingWorklistRequestFilter(query, origin)\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
279 query['0040,0100'][1]['0040,0001'] = nil\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
280 return query\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
281 end");
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
282 self.assertEqual(1, len(RunQuery('Sequences/Queries/orig.7814.dump', []))) # query is targeting STATION_AET but, since we have removed this field, we should get 2 queries
93
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
283
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
284 def test_encodings(self):
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
285 # Check out ../../Database/Worklists/Encodings/database.dump
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
286 TEST = u'Test-éüäöòДΘĝדصķћ๛ﾈİ'
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
287 ENCODINGS = {
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
288 'Arabic' : [ 'ISO_IR 127' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
289 'Ascii' : [ 'ISO_IR 6' ], # More accurately, ISO 646
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
290 'Cyrillic' : [ 'ISO_IR 144' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
291 'Greek' : [ 'ISO_IR 126' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
292 'Hebrew' : [ 'ISO_IR 138' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
293 'Japanese' : [ 'ISO_IR 13', 'shift-jis' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
294 'Latin1' : [ 'ISO_IR 100' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
295 'Latin2' : [ 'ISO_IR 101' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
296 'Latin3' : [ 'ISO_IR 109' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
297 'Latin4' : [ 'ISO_IR 110' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
298 'Latin5' : [ 'ISO_IR 148' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
299 'Thai' : [ 'ISO_IR 166', 'tis-620' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
300 'Utf8' : [ 'ISO_IR 192' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
301 }
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
302
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
303 AddToDatabase('Encodings/database.dump')
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
304
609
a8e49d30f634 compatibility of Plugins/Worklists/Run.py with python 3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 536
diff changeset
305 for (name, encoding) in ENCODINGS.items():
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
306 self.assertEqual(name, DoPut(ORTHANC, '/tools/default-encoding', name))
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
307 result = RunQuery('Encodings/query.dump', [])
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
308
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
309 self.assertEqual(1, len(result))
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
310 self.assertEqual(2, len(result[0]))
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
311 tags = ParseTopLevelTags(result[0])
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
312
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
313 if len(encoding) == 1:
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
314 encoded = TEST.encode(name, 'ignore')
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
315 else:
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
316 encoded = TEST.encode(encoding[1], 'ignore')
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
317
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
318 self.assertEqual(encoding[0], tags['0008,0005'])
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
319 self.assertEqual(encoded, tags['0010,0010'])
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
320
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
321
109
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
322 def test_bitbucket_issue_49(self):
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
323 def Check(encoding, expectedEncoding, expectedContent):
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
324 DoPut(ORTHANC, '/tools/default-encoding', encoding)
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
325 result = RunQuery('Encodings/issue49-latin1.query', [])
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
326 self.assertEqual(1, len(result))
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
327 self.assertEqual(2, len(result[0]))
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
328 tags = ParseTopLevelTags(result[0])
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
329 self.assertEqual(expectedEncoding, tags['0008,0005'])
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
330 self.assertEqual(expectedContent, tags['0010,0010'])
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
331
109
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
332 AddToDatabase('Encodings/issue49-latin1.wl')
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
333 Check('Ascii', 'ISO_IR 6', r'VANILL^LAURA^^^Mme')
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
334 Check('Utf8', 'ISO_IR 192', r'VANILLÉ^LAURA^^^Mme')
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
335 Check('Latin1', 'ISO_IR 100', u'VANILLÉ^LAURA^^^Mme'.encode('latin-1', 'ignore'))
422
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
336
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
337
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
338 def test_format(self):
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
339 DoPut(ORTHANC, '/tools/default-encoding', 'Latin1')
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
340 AddToDatabase('Dcmtk/Database/wklist1.dump')
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
341
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
342 # Only behavior of Orthanc <= 1.9.4
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
343 a = DoPost(ORTHANC, '/modalities/self/find-worklist', {
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
344 'PatientID' : ''
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
345 })
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
346 self.assertEqual(1, len(a))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
347 self.assertEqual(2, len(a[0]))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
348 self.assertEqual('AV35674', a[0]['PatientID'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
349 self.assertEqual('ISO_IR 100', a[0]['SpecificCharacterSet'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
350
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
351 a = DoPost(ORTHANC, '/modalities/self/find-worklist', {
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
352 'Query' : {
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
353 'PatientID' : ''
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
354 }
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
355 })
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
356 self.assertEqual(1, len(a))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
357 self.assertEqual(2, len(a[0]))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
358 self.assertEqual('AV35674', a[0]['PatientID'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
359 self.assertEqual('ISO_IR 100', a[0]['SpecificCharacterSet'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
360
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
361 a = DoPost(ORTHANC, '/modalities/self/find-worklist', {
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
362 'Query' : {
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
363 'PatientID' : ''
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
364 },
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
365 'Short' : True
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
366 })
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
367 self.assertEqual(1, len(a))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
368 self.assertEqual(2, len(a[0]))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
369 self.assertEqual('AV35674', a[0]['0010,0020'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
370 self.assertEqual('ISO_IR 100', a[0]['0008,0005'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
371
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
372 a = DoPost(ORTHANC, '/modalities/self/find-worklist', {
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
373 'Query' : {
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
374 'PatientID' : ''
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
375 },
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
376 'Full' : True
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
377 })
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
378 self.assertEqual(1, len(a))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
379 self.assertEqual(2, len(a[0]))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
380 self.assertEqual('AV35674', a[0]['0010,0020']['Value'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
381 self.assertEqual('PatientID', a[0]['0010,0020']['Name'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
382 self.assertEqual('ISO_IR 100', a[0]['0008,0005']['Value'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
383 self.assertEqual('SpecificCharacterSet', a[0]['0008,0005']['Name'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
384
109
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
385
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
386 try:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
387 print('\nStarting the tests...')
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
388 unittest.main(argv = [ sys.argv[0] ] + args.options)
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
389
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
390 finally:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
391 print('\nDone')