Mercurial > hg > orthanc-tests

comparison Tests/Tests.py @ 61:967d44407308

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test UnknownSopClassAccepted option
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 23 Nov 2015 15:24:45 +0100
parents cd3c7f70f139
children f9c4ce95756f
comparison
equal deleted inserted replaced
60:cd3c7f70f139 61:967d44407308
1866 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % b).strip()) 1866 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % b).strip())
1867 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/Modality' % b).strip()) 1867 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/Modality' % b).strip())
1868 1868
1869 1869
1870 def test_incoming_jpeg(self): 1870 def test_incoming_jpeg(self):
1871 def storescu(): 1871 def storescu(image, acceptUnknownSopClassUid):
1872 if acceptUnknownSopClassUid:
1873 tmp = [ '-xf', GetDatabasePath('UnknownSopClassUid.cfg'), 'Default' ]
1874 else:
1875 tmp = [ '-xs' ]
1876
1872 with open(os.devnull, 'w') as FNULL: 1877 with open(os.devnull, 'w') as FNULL:
1873 subprocess.check_call([ FindExecutable('storescu'), '-xs', 1878 subprocess.check_call([ FindExecutable('storescu') ] + tmp +
1874 _REMOTE['Server'], str(_REMOTE['DicomPort']), 1879 [ _REMOTE['Server'], str(_REMOTE['DicomPort']),
1875 GetDatabasePath('Knix/Loc/IM-0001-0001.dcm') ], 1880 GetDatabasePath(image) ],
1876 stderr = FNULL) 1881 stderr = FNULL)
1877 1882
1878 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) 1883 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
1879 InstallLuaScript('Lua/TransferSyntaxDisable.lua') 1884 InstallLuaScript('Lua/TransferSyntaxDisable.lua')
1880 self.assertRaises(Exception, storescu) 1885 self.assertRaises(Exception, lambda: storescu('Knix/Loc/IM-0001-0001.dcm', False))
1886 self.assertRaises(Exception, lambda: storescu('UnknownSopClassUid.dcm', True))
1881 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) 1887 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
1882 InstallLuaScript('Lua/TransferSyntaxEnable.lua') 1888 InstallLuaScript('Lua/TransferSyntaxEnable.lua')
1883 DoPost(_REMOTE, '/tools/execute-script', "print('All special transfer syntaxes are now accepted')") 1889 storescu('Knix/Loc/IM-0001-0001.dcm', False)
1884 storescu() 1890 storescu('UnknownSopClassUid.dcm', True)
1885 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) 1891 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
1886 1892
1887 1893
1888 def test_storescu_jpeg(self): 1894 def test_storescu_jpeg(self):
1889 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports'])) 1895 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
1890 1896