orthanc-tests: Tests/Tests.py comparison

comparison Tests/Tests.py @ 589:47b87c87213b

new tests for GET /tools/create-archive

author	Alain Mazy <am@osimis.io>
date	Fri, 24 Nov 2023 18:15:10 +0100
parents	8aa101e126d0
children	3cb7c6162c77

comparison

equal deleted inserted replaced

-:8aa101e126d0
+:47b87c87213b
 '1d429ccb-bdcc78a1-7d129d6a-ba4966ed-fe4dbd87'
 ])
 z = zipfile.ZipFile(StringIO(s), "r")
 self.assertEqual(7, len(z.namelist()))
+if IsOrthancVersionAbove(_REMOTE, 1, 12, 2):
+s = DoGet(_REMOTE, '/tools/create-archive?resources=ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17,1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0,1d429ccb-bdcc78a1-7d129d6a-ba4966ed-fe4dbd87')
+z = zipfile.ZipFile(StringIO(s), "r")
+self.assertEqual(7, len(z.namelist()))
 def test_decode_brainix_as_jpeg(self):
 i = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
 j = GetImage(_REMOTE, '/instances/%s/preview' % i)
 self.assertIn('OK', result)
 def test_bitbucket_issue_44(self):
-# https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=44
+# https://bugs.orthanc-server.com/show_bug.cgi?id=44
 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')
 UploadInstance(_REMOTE, 'Issue44/Monochrome2.dcm')
 # dcmcjpeg +ua +eb Monochrome1.dcm Monochrome1-Jpeg.dcm
 UploadInstance(_REMOTE, 'Issue44/Monochrome1-Jpeg.dcm')
 # white (255), should be rendered as white (255)
 self.assertEqual(255, im.getpixel((0,0)))
 def test_bitbucket_issue_42(self):
-# https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=42
+# https://bugs.orthanc-server.com/show_bug.cgi?id=42
 # This test fails on DCMTK 3.6.0, but succeeds in DCMTK 3.6.1 snapshots and DCMTK 3.6.2
 UploadInstance(_REMOTE, 'Issue42.dcm')['ID']
 modified = DoPost(_REMOTE,
 '/patients/da128605-e040d0c4-310615d2-3475da63-df2d1ef4/modify',
 '{"Replace":{"PatientID":"Hello","PatientName":"Sample patient name"},"Force":true}',
 self.assertTrue('PatientID' in modified)
 def test_rest_find_limit(self):
 # Check the "Since" and "Limit" parameters in URI "/tools/find"
-# Related to issue 53: https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=53
+# Related to issue 53: https://bugs.orthanc-server.com/show_bug.cgi?id=53
 # Upload 6 instances
 brainix = []
 knee = []
 for i in range(2):
 self.assertEqual(0, len(set(b) ^ set(knee)))
 def test_bitbucket_issue_46(self):
 # "PHI remaining after anonymization"
-# https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=46
+# https://bugs.orthanc-server.com/show_bug.cgi?id=46
 def GetAnonymizedTags(study, version):
 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
 { 'DicomVersion' : version },
 'application/json') ['ID']
 def test_bitbucket_issue_56(self):
 # Case-insensitive matching over accents. This test assumes
 # that the "CaseSensitivePN" configuration option of Orthanc
 # is set to "false" (default value).
-# https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=56
+# https://bugs.orthanc-server.com/show_bug.cgi?id=56
 def Check(name, expected, expectedSensitive):
 a = CallFindScu([ '-k', '0008,0005=ISO_IR 192',  # Use UTF-8
 '-k', '0008,0052=PATIENT',
 '-k', 'PatientName=%s' % name ])
 self.assertEqual(str(content1), str(content2))
 def test_bitbucket_issue_94(self):
 # "a simple instance modification should not modify FrameOfReferenceUID + ..."
-# https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=94
+# https://bugs.orthanc-server.com/show_bug.cgi?id=94
 i = UploadInstance(_REMOTE, 'Issue94.dcm')['ID']
 source = DoGet(_REMOTE, '/instances/%s/attachments/dicom/data' % i)
 modified = DoPost(_REMOTE, '/instances/%s/modify' % i,
 Compare('HierarchicalAnonymization/StructuredReports/IM0',
 'HierarchicalAnonymization/StructuredReports/IM0.json')
 def test_issue_95_encodings(self):
-# https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=95
+# https://bugs.orthanc-server.com/show_bug.cgi?id=95
 # Check out image: "../Database/Encodings/DavidClunie/charsettests.screenshot.png"
 # Very useful tool: "file2" from package "file-kanji"
 def GetPatientName(dicom):
 def test_bitbucket_issue_131(self):
 # "Orthanc PACS silently fails to C-MOVE due to duplicate
 # StudyInstanceUID in it's database."
-# https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=131
+# https://bugs.orthanc-server.com/show_bug.cgi?id=131
 # Insert 2 instances, with the same StudyInstanceUID, but with
 # different patient IDs. Orthanc will create 2 distincts
 # patients, and the hierarchy of resources above the two
 # instances will be fully disjoint.
 def test_bitbucket_issue_140(self):
 # "Modifying private tags with REST API changes VR from LO to
 # UN." This test fails if DCMTK <= 3.6.1 (e.g. fails on Ubuntu 16.04).
-# https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=140
+# https://bugs.orthanc-server.com/show_bug.cgi?id=140
 source = UploadInstance(_REMOTE, 'Issue140.dcm') ['ID']
 series = DoGet(_REMOTE, '/instances/%s' % source) ['ParentSeries']
 target = DoPost(_REMOTE, '/series/%s/modify' % series, {
 'Replace' : { 'RadioButton3' : 'aaabbbccc' },
 'Normalize' : False
 }))
 def test_bitbucket_issue_141(self):
-# https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=141
+# https://bugs.orthanc-server.com/show_bug.cgi?id=141
 a = UploadInstance(_REMOTE, 'Issue141.dcm') ['ID']
 study = '494c8037-b237f263-d8f15075-c8cb2280-daf39bd1'
 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f:
 pdf = f.read()
 UploadInstance(_REMOTE, '2019-06-17-VedranZdesic.dcm')
 DoPost(_REMOTE, '/studies/0c4aca1d-c107a241-6659d6aa-594c674a-a468b94a/modify', {})
 def test_log_level(self):
-# https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=65
+# https://bugs.orthanc-server.com/show_bug.cgi?id=65
 original = DoGet(_REMOTE, '/tools/log-level')
 DoPut(_REMOTE, '/tools/log-level', 'default')
 self.assertEqual('default', DoGet(_REMOTE, '/tools/log-level'))
 DoGet(_REMOTE, '/system')
 self.assertEqual(24, im.size[1])
 def test_bitbucket_issue_154(self):
 # "Matching against list of UID-s by C-MOVE"
-# https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=154
+# https://bugs.orthanc-server.com/show_bug.cgi?id=154
 a = UploadInstance(_REMOTE, 'Issue154-d1.dcm') ['ID']
 b = UploadInstance(_REMOTE, 'Issue154-d2.dcm') ['ID']
 study = '1.2.826.0.1.3680043.8.498.35214236271657363033644818354280454731'
 series1 = '1.2.826.0.1.3680043.8.498.12243321927795467590791662266352305113'
 'Resources' : [ info['ParentStudy'] ],
 'Transcode' : '1.2.840.10008.1.2.4.57',
 })
 self.assertEqual(2, len(z.namelist()))
 self.assertEqual('1.2.840.10008.1.2.4.57', GetTransferSyntax(z.read('IMAGES/IM0')))
+if IsOrthancVersionAbove(_REMOTE, 1, 12, 2):
+z = GetArchive(_REMOTE, '/tools/create-archive?resources=%s&transcode=1.2.840.10008.1.2.4.50' % info['ParentStudy'])
+self.assertEqual(1, len(z.namelist()))
+self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(z.read(z.namelist()[0])))
+z = GetArchive(_REMOTE, '/tools/create-media?resources=%s&transcode=1.2.840.10008.1.2.4.51' % info['ParentStudy'])
+self.assertEqual(2, len(z.namelist()))
+self.assertEqual('1.2.840.10008.1.2.4.51', GetTransferSyntax(z.read('IMAGES/IM0')))
+z = GetArchive(_REMOTE, '/tools/create-media-extended?resources=%s&transcode=1.2.840.10008.1.2.4.57' % info['ParentStudy'])
+self.assertEqual(2, len(z.namelist()))
+self.assertEqual('1.2.840.10008.1.2.4.57', GetTransferSyntax(z.read('IMAGES/IM0')))
 def test_download_file_transcode(self):
 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2):
 self.assertEqual('hello2', DoGet(_REMOTE, '/instances/%s/attachments/1024/data' % i))
 def test_issue_195(self):
 # This fails on Orthanc <= 1.9.2
-# https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=195
+# https://bugs.orthanc-server.com/show_bug.cgi?id=195
 a = UploadInstance(_REMOTE, 'Issue195.dcm')['ID']
 b = DoGet(_REMOTE, '/instances/%s/file' % a,
 headers = { 'Accept' : 'application/dicom+json' })
 # The expected result can be found by typing "dcm2json Database/Issue195.dcm"
 self.assertEqual('0020,9056', tags['0020,9165'])
 def test_issue_146(self):
 # "Update Anonyization to 2019c"
-# https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=146
+# https://bugs.orthanc-server.com/show_bug.cgi?id=146
 def GetTags(study, params):
 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, params) ['ID']
 b = DoGet(_REMOTE, '/studies/%s/instances' % a)
 self.assertEqual(1, len(b))
 self.assertFalse('0008,1110' in tags2['0008,0124'][0])
 def test_issue_200(self):
 # https://groups.google.com/g/orthanc-users/c/9CTLsL-JqDw/m/2I0xgyYHBAAJ
-# https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=200
+# https://bugs.orthanc-server.com/show_bug.cgi?id=200
 self.assertEqual(0, len(DoGet(_REMOTE, '/changes') ['Changes']))
 self.assertEqual(0, len(DoGet(_REMOTE, '/changes?last') ['Changes']))
 u = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
 for change in DoGet(_REMOTE, '/changes') ['Changes']:

Mercurial > hg > orthanc-tests

comparison Tests/Tests.py @ 589:47b87c87213b