Mercurial > hg > orthanc-tests

annotate Plugins/Worklists/Run.py @ 635:88539de02bcc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clarifying worklists test
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 02 Apr 2024 18:37:40 +0200
parents 575aa420f866
children 685022ee236c
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
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 answers = []
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 current = []
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
119 isQuery = True
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120
635
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
121 for line in a:
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
122 as_ascii = line.decode('ascii', errors='ignore')
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
123
635
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
124 if as_ascii.startswith('E:'):
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
125 raise Exception('Error while running findscu')
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
126
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
127 if (as_ascii.startswith('I: ---') or
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
128 as_ascii.startswith('W: ---')):
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
129 if isQuery:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
130 isQuery = False
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
131 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
132 # This is a separator between DICOM datasets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
133 if len(current) > 0:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
134 answers.append(current)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
135 current = []
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136
635
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
137 elif (as_ascii.startswith('I: (') or
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
138 as_ascii.startswith('W: (')):
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
139
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
140 # This is a tag
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
141 if not isQuery:
635
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
142 tag = as_ascii[4:13].lower()
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
143 if not tag in ignoreTags:
635
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
144 line_without_comment = re.sub(b'\s*#.*', b'', line)
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
145 line_without_comment = line_without_comment.replace(b'\0', b'')
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
146 current.append(line_without_comment)
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 if len(current) > 0:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 answers.append(current)
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151 return answers
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 def CompareAnswers(expected, actual):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 if len(expected) != len(actual):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 return False
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 if len(expected) == 0:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 return True
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 for i in range(len(expected)):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 for j in range(len(actual)):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 if expected[i] == actual[j]:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 return True
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 return False
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
168 def ParseTopLevelTags(answer):
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
169 tags = {}
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
170 for line in answer:
635
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
171 as_ascii = line.decode('ascii', errors='ignore')
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
172 tag = as_ascii[4:13]
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
173 start = line.find(b'[')
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
174 end = line.rfind(b']')
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
175
88539de02bcc clarifying worklists test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 612
diff changeset
176 tags[tag] = line[start + 1 : end].strip()
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
177
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
178 return tags
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
179
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
180
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 ##
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 ## The tests
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 ##
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 class Orthanc(unittest.TestCase):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186 def setUp(self):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 if (sys.version_info >= (3, 0)):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 # Remove annoying warnings about unclosed socket in Python 3
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 import warnings
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 warnings.simplefilter("ignore", ResourceWarning)
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192 ClearDatabase()
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
193 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
194
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 def test_single(self):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 for db in range(1, 11):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 ClearDatabase()
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
199 AddToDatabase('Dcmtk/Database/wklist%d.dump' % db)
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 for query in range(0, 13):
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
202 answers = RunQuery('Dcmtk/Queries/wlistqry%d.dump' % query, [
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203 '0008,0005',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204 '0040,0004',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205 '0040,0005',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206 '0040,0020',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207 ])
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
209 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
210 expected = json.loads(f.read())
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
211 self.assertTrue(CompareAnswers(expected, answers))
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
212
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214 def test_all(self):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
215 ClearDatabase()
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 for db in range(1, 11):
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
218 AddToDatabase('Dcmtk/Database/wklist%d.dump' % db)
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
219
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
220 for query in range(0, 13):
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
221 answers = RunQuery('Dcmtk/Queries/wlistqry%d.dump' % query, [
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
222 '0008,0005',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223 '0040,0004',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
224 '0040,0005',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
225 '0040,0020',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226 ])
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
227
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
228 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
229 expected = json.loads(f.read())
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
230 self.assertTrue(CompareAnswers(expected, answers))
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
231
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
232
93
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
233 def test_vet(self):
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
234 AddToDatabase('Sequences/STATION_AET/orig.7705.dump')
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
235 AddToDatabase('Sequences/STATION_AET/orig.7814.dump')
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
236 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
237
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
238 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
239 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
240 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
241
536
6546ca088276 new tests for private creator in worklists
Alain Mazy <am@osimis.io>
parents: 511
diff changeset
242 def test_private_creator(self):
6546ca088276 new tests for private creator in worklists
Alain Mazy <am@osimis.io>
parents: 511
diff changeset
243 AddToDatabase('private-creator-wl.dump')
6546ca088276 new tests for private creator in worklists
Alain Mazy <am@osimis.io>
parents: 511
diff changeset
244
6546ca088276 new tests for private creator in worklists
Alain Mazy <am@osimis.io>
parents: 511
diff changeset
245 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
246
97
c39520dacdd7 test_other_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
247
98
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
248 @unittest.skip("This test requires to enable option 'FilterIssuerAet' in the sample worklist plugin")
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
249 def test_filter_issuer_aet(self):
97
c39520dacdd7 test_other_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
250 AddToDatabase('Sequences/STATION_AET/orig.7814.dump')
98
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
251 AddToDatabase('Sequences/STATION_AET/orig.7814.other.station.dump')
97
c39520dacdd7 test_other_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
252
98
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
253 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
254
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
255 def test_filter_issuer_aet_from_lua(self):
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
256 AddToDatabase('Sequences/STATION_AET/orig.7814.dump') # targeted at STATION_AET
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
257 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
258
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
259 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
260 InstallLuaScript(ORTHANC, "\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
261 function IncomingWorklistRequestFilter(query, origin)\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
262 query['0040,0100'][1]['0040,0001'] = origin['RemoteAet']\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
263 return query\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
264 end");
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
265
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
266 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
267
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
268
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
269 def test_remove_aet_from_query(self):
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
270 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
271
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
272 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
273 InstallLuaScript(ORTHANC, "\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
274 function IncomingWorklistRequestFilter(query, origin)\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
275 query['0040,0100'][1]['0040,0001'] = nil\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
276 return query\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
277 end");
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
278 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
279
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
280 def test_encodings(self):
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
281 # Check out ../../Database/Worklists/Encodings/database.dump
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
282 TEST = u'Test-éüäöòДΘĝדصķћ๛ﾈİ'
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
283 ENCODINGS = {
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
284 'Arabic' : [ 'ISO_IR 127' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
285 'Ascii' : [ 'ISO_IR 6' ], # More accurately, ISO 646
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
286 'Cyrillic' : [ 'ISO_IR 144' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
287 'Greek' : [ 'ISO_IR 126' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
288 'Hebrew' : [ 'ISO_IR 138' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
289 'Japanese' : [ 'ISO_IR 13', 'shift-jis' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
290 'Latin1' : [ 'ISO_IR 100' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
291 'Latin2' : [ 'ISO_IR 101' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
292 'Latin3' : [ 'ISO_IR 109' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
293 'Latin4' : [ 'ISO_IR 110' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
294 'Latin5' : [ 'ISO_IR 148' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
295 'Thai' : [ 'ISO_IR 166', 'tis-620' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
296 'Utf8' : [ 'ISO_IR 192' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
297 }
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
298
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
299 AddToDatabase('Encodings/database.dump')
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
300
609
a8e49d30f634 compatibility of Plugins/Worklists/Run.py with python 3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 536
diff changeset
301 for (name, encoding) in ENCODINGS.items():
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
302 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
303 result = RunQuery('Encodings/query.dump', [])
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
304
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
305 self.assertEqual(1, len(result))
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
306 self.assertEqual(2, len(result[0]))
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
307 tags = ParseTopLevelTags(result[0])
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 if len(encoding) == 1:
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
310 encoded = TEST.encode(name, 'ignore')
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
311 else:
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
312 encoded = TEST.encode(encoding[1], 'ignore')
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
313
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
314 self.assertEqual(encoding[0], tags['0008,0005'])
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
315 self.assertEqual(encoded, tags['0010,0010'])
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
316
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
317
109
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
318 def test_bitbucket_issue_49(self):
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
319 def Check(encoding, expectedEncoding, expectedContent):
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
320 DoPut(ORTHANC, '/tools/default-encoding', encoding)
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
321 result = RunQuery('Encodings/issue49-latin1.query', [])
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
322 self.assertEqual(1, len(result))
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
323 self.assertEqual(2, len(result[0]))
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
324 tags = ParseTopLevelTags(result[0])
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
325 self.assertEqual(expectedEncoding, tags['0008,0005'])
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
326 self.assertEqual(expectedContent, tags['0010,0010'])
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
327
109
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
328 AddToDatabase('Encodings/issue49-latin1.wl')
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
329 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
330 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
331 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
332
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
333
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
334 def test_format(self):
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
335 DoPut(ORTHANC, '/tools/default-encoding', 'Latin1')
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
336 AddToDatabase('Dcmtk/Database/wklist1.dump')
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 # Only behavior of Orthanc <= 1.9.4
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
339 a = DoPost(ORTHANC, '/modalities/self/find-worklist', {
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
340 'PatientID' : ''
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 self.assertEqual(1, len(a))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
343 self.assertEqual(2, len(a[0]))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
344 self.assertEqual('AV35674', a[0]['PatientID'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
345 self.assertEqual('ISO_IR 100', a[0]['SpecificCharacterSet'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
346
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
347 a = DoPost(ORTHANC, '/modalities/self/find-worklist', {
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
348 'Query' : {
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
349 'PatientID' : ''
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 })
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
352 self.assertEqual(1, len(a))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
353 self.assertEqual(2, len(a[0]))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
354 self.assertEqual('AV35674', a[0]['PatientID'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
355 self.assertEqual('ISO_IR 100', a[0]['SpecificCharacterSet'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
356
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
357 a = DoPost(ORTHANC, '/modalities/self/find-worklist', {
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
358 'Query' : {
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
359 'PatientID' : ''
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 'Short' : True
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
362 })
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
363 self.assertEqual(1, len(a))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
364 self.assertEqual(2, len(a[0]))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
365 self.assertEqual('AV35674', a[0]['0010,0020'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
366 self.assertEqual('ISO_IR 100', a[0]['0008,0005'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
367
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
368 a = DoPost(ORTHANC, '/modalities/self/find-worklist', {
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
369 'Query' : {
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
370 'PatientID' : ''
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 'Full' : True
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
373 })
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
374 self.assertEqual(1, len(a))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
375 self.assertEqual(2, len(a[0]))
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
376 self.assertEqual('AV35674', a[0]['0010,0020']['Value'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
377 self.assertEqual('PatientID', a[0]['0010,0020']['Name'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
378 self.assertEqual('ISO_IR 100', a[0]['0008,0005']['Value'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
379 self.assertEqual('SpecificCharacterSet', a[0]['0008,0005']['Name'])
91170313187c worklists: test_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
380
109
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
381
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
382 try:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
383 print('\nStarting the tests...')
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
384 unittest.main(argv = [ sys.argv[0] ] + args.options)
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
385
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
386 finally:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
387 print('\nDone')