annotate Plugins/Worklists/Run.py @ 195:af8e034f4262

preparing for 2019
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 24 Dec 2018 13:42:45 +0100
parents d468cbe1b161
children 943166deebcb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 #!/usr/bin/python
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
195
af8e034f4262 preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
8 # Copyright (C) 2017-2019 Osimis S.A., Belgium
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 #
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 # 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
11 # 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
12 # 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
13 # License, or (at your option) any later version.
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 #
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 # 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
16 # WITHOUT ANY WARRANTY; without even the implied warranty of
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 # General Public License for more details.
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 #
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 # 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
21 # 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
22
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 import argparse
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 import os
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 import pprint
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 import re
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 import subprocess
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 import sys
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 import tempfile
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 import unittest
109
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
32 from shutil import copyfile
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 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
35 from Toolbox import *
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
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 ## Parse the command-line arguments
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 ##
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 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
43
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 parser.add_argument('--server',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 default = 'localhost',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 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
47 parser.add_argument('--rest',
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
48 type = int,
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
49 default = 8042,
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
50 help = 'Port to the REST API')
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
51 parser.add_argument('--username',
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
52 default = 'alice',
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
53 help = 'Username to the REST API')
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
54 parser.add_argument('--password',
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
55 default = 'orthanctest',
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
56 help = 'Password to the REST API')
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 parser.add_argument('--dicom',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 type = int,
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 default = 4242,
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 help = 'DICOM port of the Orthanc instance to test')
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 parser.add_argument('options', metavar = 'N', nargs = '*',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 help='Arguments to Python unittest')
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 args = parser.parse_args()
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65
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
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
68 ORTHANC = DefineOrthanc(server = args.server,
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
69 username = args.username,
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
70 password = args.password,
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
71 restPort = args.rest)
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
72
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
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 ##
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 ## Toolbox
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 ##
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 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
80 WORKING = os.path.join(DATABASE, 'Working')
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
82 print('Database directory: %s' % DATABASE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
83 print('Working directory: %s' % WORKING)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
84
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 try:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 os.mkdir(WORKING)
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 except Exception as e:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 # The working folder has already been created
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 pass
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 def ClearDatabase():
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 for f in os.listdir(WORKING):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 if f != 'lockfile':
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 os.remove(os.path.join(WORKING, f))
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95
109
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
96 def AddToDatabase(worklist):
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
97 extension = os.path.splitext(worklist)[1].lower()
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
98 source = os.path.join(DATABASE, worklist)
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
99 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
100
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
101 if extension == '.dump':
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
102 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
103 else:
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
104 copyfile(source, target)
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
105
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 def RunQuery(source, ignoreTags):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 with tempfile.NamedTemporaryFile() as f:
93
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
109 subprocess.check_call([ 'dump2dcm', '--write-xfer-little',
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 os.path.join(DATABASE, source), f.name ])
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 a = subprocess.check_output([ 'findscu', '-v', '--call', 'ORTHANC', '-aet', 'ORTHANCTEST',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 args.server, str(args.dicom), f.name ],
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 stderr = subprocess.STDOUT).splitlines()
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 if len(filter(lambda x: x.startswith('E:'), a)) > 0:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 raise Exception('Error while running findscu')
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
119 b = map(lambda x: x[3:], filter(lambda x: (x.startswith('I: ---') or
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
120 x.startswith('W: ---') or
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
121 x.startswith('I: (') or
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
122 x.startswith('W: (')), a))
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 b = map(lambda x: re.sub(r'\s*#.*', '', x), b)
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 answers = []
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 current = []
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
127 isQuery = True
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 for l in b:
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
130 l = l.replace('\0', '')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
131
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 if l[0] == '-':
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
133 if isQuery:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
134 isQuery = False
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
135 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
136 # This is a separator between DICOM datasets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
137 if len(current) > 0:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
138 answers.append(current)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
139 current = []
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 else:
108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
142 if not isQuery:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
143 tag = l[1:10].lower()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
144 if not tag in ignoreTags:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
145 current.append(l)
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 if len(current) > 0:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 answers.append(current)
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 return answers
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 def CompareAnswers(expected, actual):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 if len(expected) != len(actual):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 return False
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(expected) == 0:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 return True
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 for i in range(len(expected)):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 for j in range(len(actual)):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 if expected[i] == actual[j]:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 return True
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 return False
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
167 def ParseTopLevelTags(answer):
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
168 tags = {}
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
169 for line in answer:
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
170 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
171 tags[m.group(1)] = m.group(2).strip()
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
172
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
173 return tags
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
174
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
175
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 ##
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 ## The tests
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178 ##
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 class Orthanc(unittest.TestCase):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 def setUp(self):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 if (sys.version_info >= (3, 0)):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 # Remove annoying warnings about unclosed socket in Python 3
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 import warnings
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 warnings.simplefilter("ignore", ResourceWarning)
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 ClearDatabase()
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
188 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
189
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 def test_single(self):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192 for db in range(1, 11):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 ClearDatabase()
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
194 AddToDatabase('Dcmtk/Database/wklist%d.dump' % db)
90
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 for query in range(0, 13):
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
197 answers = RunQuery('Dcmtk/Queries/wlistqry%d.dump' % query, [
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 '0008,0005',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 '0040,0004',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 '0040,0005',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 '0040,0020',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 ])
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
204 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
205 expected = json.loads(f.read())
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206 self.assertTrue(CompareAnswers(expected, answers))
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
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
209 def test_all(self):
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
210 ClearDatabase()
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 for db in range(1, 11):
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
213 AddToDatabase('Dcmtk/Database/wklist%d.dump' % db)
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
215 for query in range(0, 13):
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
216 answers = RunQuery('Dcmtk/Queries/wlistqry%d.dump' % query, [
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
217 '0008,0005',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
218 '0040,0004',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
219 '0040,0005',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
220 '0040,0020',
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
221 ])
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
222
91
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
223 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
224 expected = json.loads(f.read())
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
225 self.assertTrue(CompareAnswers(expected, answers))
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
93
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
228 def test_vet(self):
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
229 AddToDatabase('Sequences/STATION_AET/orig.7705.dump')
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
230 AddToDatabase('Sequences/STATION_AET/orig.7814.dump')
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
231 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
232
fff2b4a24b5f test of sequences in worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 91
diff changeset
233 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
234 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
235 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
236
c39520dacdd7 test_other_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
237
98
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
238 @unittest.skip("This test requires to enable option 'FilterIssuerAet' in the sample worklist plugin")
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
239 def test_filter_issuer_aet(self):
97
c39520dacdd7 test_other_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
240 AddToDatabase('Sequences/STATION_AET/orig.7814.dump')
98
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
241 AddToDatabase('Sequences/STATION_AET/orig.7814.other.station.dump')
97
c39520dacdd7 test_other_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
242
98
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 97
diff changeset
243 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
244
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
245 def test_filter_issuer_aet_from_lua(self):
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
246 AddToDatabase('Sequences/STATION_AET/orig.7814.dump') # targeted at STATION_AET
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
247 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
248
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
249 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
250 InstallLuaScript(ORTHANC, "\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
251 function IncomingWorklistRequestFilter(query, origin)\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
252 query['0040,0100'][1]['0040,0001'] = origin['RemoteAet']\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
253 return query\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
254 end");
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
255
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
256 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
257
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 def test_remove_aet_from_query(self):
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
260 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
261
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
262 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
263 InstallLuaScript(ORTHANC, "\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
264 function IncomingWorklistRequestFilter(query, origin)\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
265 query['0040,0100'][1]['0040,0001'] = nil\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
266 return query\
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
267 end");
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 130
diff changeset
268 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
269
94
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
270 def test_encodings(self):
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
271 # Check out ../../Database/Worklists/Encodings/database.dump
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
272 TEST = u'Test-éüäöòДΘĝדصķћ๛ネİ'
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
273 ENCODINGS = {
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
274 'Arabic' : [ 'ISO_IR 127' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
275 'Ascii' : [ 'ISO_IR 6' ], # More accurately, ISO 646
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
276 'Cyrillic' : [ 'ISO_IR 144' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
277 'Greek' : [ 'ISO_IR 126' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
278 'Hebrew' : [ 'ISO_IR 138' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
279 'Japanese' : [ 'ISO_IR 13', 'shift-jis' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
280 'Latin1' : [ 'ISO_IR 100' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
281 'Latin2' : [ 'ISO_IR 101' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
282 'Latin3' : [ 'ISO_IR 109' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
283 'Latin4' : [ 'ISO_IR 110' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
284 'Latin5' : [ 'ISO_IR 148' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
285 'Thai' : [ 'ISO_IR 166', 'tis-620' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
286 'Utf8' : [ 'ISO_IR 192' ],
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
287 }
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
288
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
289 AddToDatabase('Encodings/database.dump')
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
290
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
291 for name, encoding in ENCODINGS.iteritems():
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
292 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
293 result = RunQuery('Encodings/query.dump', [])
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
294
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
295 self.assertEqual(1, len(result))
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
296 self.assertEqual(2, len(result[0]))
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
297 tags = ParseTopLevelTags(result[0])
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 if len(encoding) == 1:
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
300 encoded = TEST.encode(name, 'ignore')
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
301 else:
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
302 encoded = TEST.encode(encoding[1], 'ignore')
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
303
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
304 self.assertEqual(encoding[0], tags['0008,0005'])
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
305 self.assertEqual(encoded, tags['0010,0010'])
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
306
09afe3616660 Orthanc.test_encodings for worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 93
diff changeset
307
109
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
308 def test_bitbucket_issue_49(self):
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
309 def Check(encoding, expectedEncoding, expectedContent):
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
310 DoPut(ORTHANC, '/tools/default-encoding', encoding)
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
311 result = RunQuery('Encodings/issue49-latin1.query', [])
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
312 self.assertEqual(1, len(result))
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
313 self.assertEqual(2, len(result[0]))
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
314 tags = ParseTopLevelTags(result[0])
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
315 self.assertEqual(expectedEncoding, tags['0008,0005'])
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
316 self.assertEqual(expectedContent, tags['0010,0010'])
94
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 AddToDatabase('Encodings/issue49-latin1.wl')
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
319 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
320 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
321 Check('Latin1', 'ISO_IR 100', u'VANILLÉ^LAURA^^^Mme'.encode('latin-1', 'ignore'))
5b6812f8cc38 worklists: test_bitbucket_issue_49
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
322
90
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
323 try:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
324 print('\nStarting the tests...')
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
325 unittest.main(argv = [ sys.argv[0] ] + args.options)
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
326
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
327 finally:
afbac3eb28a5 integration tests of worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
328 print('\nDone')