Mercurial > hg > orthanc-tests

comparison Tests/Tests.py @ 68:a8d1a347a701

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SlicesShort
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 07 Dec 2015 10:00:05 +0100
parents e711ba6af7ea
children 83fd88230097
comparison
equal deleted inserted replaced
67:e711ba6af7ea 68:a8d1a347a701
2464 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/file', o['Dicom'][0]) 2464 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/file', o['Dicom'][0])
2465 self.assertEqual(76, len(o['Slices'])) 2465 self.assertEqual(76, len(o['Slices']))
2466 for j in range(76): 2466 for j in range(76):
2467 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/frames/%d' % j, o['Slices'][j]) 2467 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/frames/%d' % j, o['Slices'][j])
2468 2468
2469 self.assertEqual(1, len(o['SlicesShort']))
2470 self.assertEqual('9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02', o['SlicesShort'][0][0])
2471 self.assertEqual(0, o['SlicesShort'][0][1])
2472 self.assertEqual(76, o['SlicesShort'][0][2])
2473
2469 i = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] 2474 i = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
2470 j = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')['ID'] 2475 j = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')['ID']
2471 k = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')['ID'] 2476 k = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')['ID']
2472 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] 2477 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']
2473 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) 2478 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s)
2480 self.assertEqual('/instances/%s/file' % k, o['Dicom'][0]) 2485 self.assertEqual('/instances/%s/file' % k, o['Dicom'][0])
2481 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][2]) 2486 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][2])
2482 self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1]) 2487 self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1])
2483 self.assertEqual('/instances/%s/frames/0' % k, o['Slices'][0]) 2488 self.assertEqual('/instances/%s/frames/0' % k, o['Slices'][0])
2484 2489
2490 self.assertEqual(3, len(o['SlicesShort']))
2491 self.assertEqual(k, o['SlicesShort'][0][0])
2492 self.assertEqual(0, o['SlicesShort'][0][1])
2493 self.assertEqual(1, o['SlicesShort'][0][2])
2494 self.assertEqual(j, o['SlicesShort'][1][0])
2495 self.assertEqual(0, o['SlicesShort'][1][1])
2496 self.assertEqual(1, o['SlicesShort'][1][2])
2497 self.assertEqual(i, o['SlicesShort'][2][0])
2498 self.assertEqual(0, o['SlicesShort'][2][1])
2499 self.assertEqual(1, o['SlicesShort'][2][2])
2500
2485 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID'] 2501 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID']
2486 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm')['ID'] 2502 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm')['ID']
2487 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'] 2503 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']
2488 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s) 2504 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s)
2489 2505
2492 self.assertEqual(2, len(o['Slices'])) 2508 self.assertEqual(2, len(o['Slices']))
2493 self.assertEqual('/instances/%s/file' % i, o['Dicom'][0]) 2509 self.assertEqual('/instances/%s/file' % i, o['Dicom'][0])
2494 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1]) 2510 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1])
2495 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][0]) 2511 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][0])
2496 self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1]) 2512 self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1])
2513
2514 self.assertEqual(2, len(o['SlicesShort']))
2515 self.assertEqual(i, o['SlicesShort'][0][0])
2516 self.assertEqual(0, o['SlicesShort'][0][1])
2517 self.assertEqual(1, o['SlicesShort'][0][2])
2518 self.assertEqual(j, o['SlicesShort'][1][0])
2519 self.assertEqual(0, o['SlicesShort'][1][1])
2520 self.assertEqual(1, o['SlicesShort'][1][2])
2521
2497 2522
2498 2523
2499 def test_incoming_movescu_accession(self): 2524 def test_incoming_movescu_accession(self):
2500 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') 2525 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
2501 2526