# HG changeset patch # User Sebastien Jodogne # Date 1539082263 -7200 # Node ID 7a6b532853ab4a7dc2c09abaeb75a324f41a5d83 # Parent 911070f790e35da1ea213e730f8149fa752906f3 modalities are now described as JSON objects diff -r 911070f790e3 -r 7a6b532853ab Tests/Tests.py --- a/Tests/Tests.py Mon Oct 08 17:16:11 2018 +0200 +++ b/Tests/Tests.py Tue Oct 09 12:51:03 2018 +0200 @@ -1323,7 +1323,10 @@ DoDelete(_REMOTE, '/modalities/tata') DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoWildcardInDates' ]) modalitiesReadback = DoGet(_REMOTE, '/modalities?expand') - self.assertEqual([ "STORESCP", "localhost", 2000, 'GenericNoWildcardInDates' ], modalitiesReadback['tata']) + self.assertEqual('STORESCP', modalitiesReadback['tata']['AET']) + self.assertEqual('localhost', modalitiesReadback['tata']['Host']) + self.assertEqual(2000, modalitiesReadback['tata']['Port']) + self.assertEqual('GenericNoWildcardInDates', modalitiesReadback['tata']['Manufacturer']) self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000, 'InvalidManufacturerName' ])) self.assertTrue('store' in DoGet(_REMOTE, '/modalities/toto')) self.assertTrue('store' in DoGet(_REMOTE, '/modalities/tata'))