comparison Tests/Tests.py @ 653:fdd90df1e8ff

fix test version
author Alain Mazy <am@orthanc.team>
date Wed, 05 Jun 2024 10:28:09 +0200
parents dfd42a6c13fa
children
comparison
equal deleted inserted replaced
652:dfd42a6c13fa 653:fdd90df1e8ff
10150 s = re.findall('\(0008,0000\).*?\[(.*?)\]', i) 10150 s = re.findall('\(0008,0000\).*?\[(.*?)\]', i)
10151 self.assertEqual(0, len(s)) 10151 self.assertEqual(0, len(s))
10152 10152
10153 10153
10154 def test_tags_after_pixel_data(self): 10154 def test_tags_after_pixel_data(self):
10155 # https://discourse.orthanc-server.org/t/private-tags-with-group-7fe0-are-not-provided-via-rest-api/4744 10155 if IsOrthancVersionAbove(_REMOTE, 1, 12, 4):
10156 u = UploadInstance(_REMOTE, '2024-05-30-GuillemVela.dcm') ['ID'] 10156 # https://discourse.orthanc-server.org/t/private-tags-with-group-7fe0-are-not-provided-via-rest-api/4744
10157 10157 u = UploadInstance(_REMOTE, '2024-05-30-GuillemVela.dcm') ['ID']
10158 a = DoGet(_REMOTE, '/instances/%s/tags' % u) 10158
10159 self.assertFalse('8e05,1000' in a) 10159 a = DoGet(_REMOTE, '/instances/%s/tags' % u)
10160 10160 self.assertFalse('8e05,1000' in a)
10161 a = DoGet(_REMOTE, '/instances/%s/tags?whole' % u) 10161
10162 self.assertTrue('8e05,1000' in a) 10162 a = DoGet(_REMOTE, '/instances/%s/tags?whole' % u)
10163 self.assertEqual('XEOS_Attributes', a['8e05,0010']['Value']) 10163 self.assertTrue('8e05,1000' in a)
10164 self.assertEqual('acquisition', a['8e05,1000']['Value']) 10164 self.assertEqual('XEOS_Attributes', a['8e05,0010']['Value'])
10165 self.assertEqual('specimen', a['8e05,1001']['Value']) 10165 self.assertEqual('acquisition', a['8e05,1000']['Value'])
10166 10166 self.assertEqual('specimen', a['8e05,1001']['Value'])
10167 a = DoGet(_REMOTE, '/instances/%s/tags?full' % u) 10167
10168 self.assertFalse('8e05,1000' in a) 10168 a = DoGet(_REMOTE, '/instances/%s/tags?full' % u)
10169 10169 self.assertFalse('8e05,1000' in a)
10170 a = DoGet(_REMOTE, '/instances/%s/tags?full&whole' % u) 10170
10171 self.assertTrue('8e05,1000' in a) 10171 a = DoGet(_REMOTE, '/instances/%s/tags?full&whole' % u)
10172 self.assertEqual('XEOS_Attributes', a['8e05,0010']['Value']) 10172 self.assertTrue('8e05,1000' in a)
10173 self.assertEqual('acquisition', a['8e05,1000']['Value']) 10173 self.assertEqual('XEOS_Attributes', a['8e05,0010']['Value'])
10174 self.assertEqual('specimen', a['8e05,1001']['Value']) 10174 self.assertEqual('acquisition', a['8e05,1000']['Value'])
10175 10175 self.assertEqual('specimen', a['8e05,1001']['Value'])
10176 a = DoGet(_REMOTE, '/instances/%s/tags?short' % u) 10176
10177 self.assertFalse('8e05,1000' in a) 10177 a = DoGet(_REMOTE, '/instances/%s/tags?short' % u)
10178 10178 self.assertFalse('8e05,1000' in a)
10179 a = DoGet(_REMOTE, '/instances/%s/tags?short&whole' % u) 10179
10180 self.assertTrue('8e05,1000' in a) 10180 a = DoGet(_REMOTE, '/instances/%s/tags?short&whole' % u)
10181 self.assertEqual('XEOS_Attributes', a['8e05,0010']) 10181 self.assertTrue('8e05,1000' in a)
10182 self.assertEqual('acquisition', a['8e05,1000']) 10182 self.assertEqual('XEOS_Attributes', a['8e05,0010'])
10183 self.assertEqual('specimen', a['8e05,1001']) 10183 self.assertEqual('acquisition', a['8e05,1000'])
10184 10184 self.assertEqual('specimen', a['8e05,1001'])
10185 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % u) 10185
10186 self.assertFalse('Unknown Tag & Data' in a) 10186 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % u)
10187 10187 self.assertFalse('Unknown Tag & Data' in a)
10188 a = DoGet(_REMOTE, '/instances/%s/tags?simplify&whole' % u) 10188
10189 self.assertTrue('Unknown Tag & Data' in a) 10189 a = DoGet(_REMOTE, '/instances/%s/tags?simplify&whole' % u)
10190 10190 self.assertTrue('Unknown Tag & Data' in a)
10191 a = DoGet(_REMOTE, '/instances/%s/simplified-tags' % u) 10191
10192 self.assertFalse('Unknown Tag & Data' in a) 10192 a = DoGet(_REMOTE, '/instances/%s/simplified-tags' % u)
10193 10193 self.assertFalse('Unknown Tag & Data' in a)
10194 a = DoGet(_REMOTE, '/instances/%s/simplified-tags?whole' % u) 10194
10195 self.assertTrue('Unknown Tag & Data' in a) 10195 a = DoGet(_REMOTE, '/instances/%s/simplified-tags?whole' % u)
10196 self.assertTrue('Unknown Tag & Data' in a)
10196 10197
10197 10198
10198 def test_requested_tags(self): 10199 def test_requested_tags(self):
10199 u = UploadInstance(_REMOTE, 'DummyCT.dcm') 10200 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
10200 10201