comparison Plugins/Worklists/Run.py @ 91:ba5619c3941d

move
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 06 Dec 2016 13:26:51 +0100
parents afbac3eb28a5
children fff2b4a24b5f
comparison
equal deleted inserted replaced
90:afbac3eb28a5 91:ba5619c3941d
139 139
140 140
141 def test_single(self): 141 def test_single(self):
142 for db in range(1, 11): 142 for db in range(1, 11):
143 ClearDatabase() 143 ClearDatabase()
144 AddToDatabase('DcmtkDatabase/wklist%d.dump' % db) 144 AddToDatabase('Dcmtk/Database/wklist%d.dump' % db)
145 145
146 for query in range(0, 13): 146 for query in range(0, 13):
147 answers = RunQuery('DcmtkQueries/wlistqry%d.dump' % query, [ 147 answers = RunQuery('Dcmtk/Queries/wlistqry%d.dump' % query, [
148 '0008,0005', 148 '0008,0005',
149 '0040,0004', 149 '0040,0004',
150 '0040,0005', 150 '0040,0005',
151 '0040,0020', 151 '0040,0020',
152 ]) 152 ])
153 153
154 with open(os.path.join('%s/DcmtkExpected/single-%d-%d.json' % (DATABASE, db, query)), 'r') as f: 154 with open(os.path.join('%s/Dcmtk/Expected/single-%d-%d.json' % (DATABASE, db, query)), 'r') as f:
155 expected = json.loads(f.read()) 155 expected = json.loads(f.read())
156 self.assertTrue(CompareAnswers(expected, answers)) 156 self.assertTrue(CompareAnswers(expected, answers))
157 157
158 158
159 def test_all(self): 159 def test_all(self):
160 ClearDatabase() 160 ClearDatabase()
161 161
162 for db in range(1, 11): 162 for db in range(1, 11):
163 AddToDatabase('DcmtkDatabase/wklist%d.dump' % db) 163 AddToDatabase('Dcmtk/Database/wklist%d.dump' % db)
164 164
165 for query in range(0, 13): 165 for query in range(0, 13):
166 answers = RunQuery('DcmtkQueries/wlistqry%d.dump' % query, [ 166 answers = RunQuery('Dcmtk/Queries/wlistqry%d.dump' % query, [
167 '0008,0005', 167 '0008,0005',
168 '0040,0004', 168 '0040,0004',
169 '0040,0005', 169 '0040,0005',
170 '0040,0020', 170 '0040,0020',
171 ]) 171 ])
172 172
173 with open(os.path.join('%s/DcmtkExpected/all-%d.json' % (DATABASE, query)), 'r') as f: 173 with open(os.path.join('%s/Dcmtk/Expected/all-%d.json' % (DATABASE, query)), 'r') as f:
174 expected = json.loads(f.read()) 174 expected = json.loads(f.read())
175 self.assertTrue(CompareAnswers(expected, answers)) 175 self.assertTrue(CompareAnswers(expected, answers))
176 176
177 177
178 178