Mercurial > hg > orthanc-tests

comparison Tests/Tests.py @ 268:c8d79d8258cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test_bitbucket_issue_154
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 26 Feb 2020 11:58:33 +0100
parents f30b5bfa9599
children b2d8582b9181
comparison
equal deleted inserted replaced
267:f30b5bfa9599 268:c8d79d8258cd
5247 self.assertEqual(12, im.size[1]) 5247 self.assertEqual(12, im.size[1])
5248 im = GetImage(_REMOTE, '/instances/%s/rendered?width=40&height=24' % i) 5248 im = GetImage(_REMOTE, '/instances/%s/rendered?width=40&height=24' % i)
5249 self.assertEqual("L", im.mode) 5249 self.assertEqual("L", im.mode)
5250 self.assertEqual(20, im.size[0]) 5250 self.assertEqual(20, im.size[0])
5251 self.assertEqual(24, im.size[1]) 5251 self.assertEqual(24, im.size[1])
5252
5253
5254 def test_bitbucket_issue_154(self):
5255 # "Matching against list of UID-s by C-MOVE"
5256 # https://bitbucket.org/sjodogne/orthanc/issues/154/
5257 a = UploadInstance(_REMOTE, 'Issue154-d1.dcm') ['ID']
5258 b = UploadInstance(_REMOTE, 'Issue154-d2.dcm') ['ID']
5259
5260 study = '1.2.826.0.1.3680043.8.498.35214236271657363033644818354280454731'
5261 series1 = '1.2.826.0.1.3680043.8.498.12243321927795467590791662266352305113'
5262 series2 = '1.2.826.0.1.3680043.8.498.43769499931624584079690260699536473555'
5263
5264 # C-FIND is working on list of UIDs
5265 i = CallFindScu([ '-k', 'QueryRetrieveLevel=SERIES',
5266 '-k', 'StudyInstanceUID=%s' % study,
5267 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2) ])
5268 series = re.findall('\(0020,000e\).*?\[(.*?)\]', i)
5269 self.assertEqual(2, len(series))
5270 self.assertTrue(series1 in series)
5271 self.assertTrue(series2 in series)
5272
5273 # Individual retrieval is working in Orthanc < 1.6.0
5274 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
5275 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
5276 '--study', '-k', 'QueryRetrieveLevel=SERIES',
5277 '-k', 'StudyInstanceUID=%s' % study,
5278 '-k', 'SeriesInstanceUID=%s' % series1,
5279 ])))
5280 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
5281 '--study', '-k', 'QueryRetrieveLevel=SERIES',
5282 '-k', 'StudyInstanceUID=%s' % study,
5283 '-k', 'SeriesInstanceUID=%s' % series2,
5284 ])))
5285 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
5286
5287 DropOrthanc(_LOCAL)
5288
5289 # But list matching is working only in Orthanc >= 1.6.0
5290 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
5291 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
5292 '--study', '-k', 'QueryRetrieveLevel=SERIES',
5293 '-k', 'StudyInstanceUID=%s' % study,
5294 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2),
5295 ])))
5296 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))