changeset 182:7a6b532853ab

modalities are now described as JSON objects
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Oct 2018 12:51:03 +0200
parents 911070f790e3
children 76747a374aff
files Tests/Tests.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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'))