From 96c5a741f4f6e246893cfe9f8d6ed9dfb000bfcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20=20MENAGER?= <herve.menager@pasteur.fr>
Date: Wed, 17 Jul 2019 14:51:22 +0200
Subject: [PATCH] adjust test of convert_iupac_to_smiles_and_inchi web service

the format of the returned json has slightly changed, see below, therefore
we are now testing the values returned in the json

before:

```json
{
  'inchi': 'InChI=1/C7H5N3O6/c1-4-6(9(13)14)2-5(8(11)12)3-7(4)10(15)16/h2-3H,1H3',
  'smiles': '[N+](=O)([O-])C1=C(C)C(=CC(=C1)[N+](=O)[O-])[N+](=O)[O-]',
  'stdinchi': 'InChI=1S/C7H5N3O6/c1-4-6(9(13)14)2-5(8(11)12)3-7(4)10(15)16/h2-3H,1H3',
  'stdinchikey': 'SPSSULHKWOKEEL-UHFFFAOYSA-N'
}
```

after:

```json
{
  'inchi': 'InChI=1/C7H5N3O6/c1-4-6(9(13)14)2-5(8(11)12)3-7(4)10(15)16/h2-3H,1H3',
  'smiles': '[N+](=O)([O-])C1=C(C)C(=CC(=C1)[N+](=O)[O-])[N+](=O)[O-]',
  'status': 'SUCCESS',
  'stdinchi': 'InChI=1S/C7H5N3O6/c1-4-6(9(13)14)2-5(8(11)12)3-7(4)10(15)16/h2-3H,1H3',
  'stdinchikey': 'SPSSULHKWOKEEL-UHFFFAOYSA-N'
}
```
---
 ippisite/ippidb/tests.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ippisite/ippidb/tests.py b/ippisite/ippidb/tests.py
index 8afe58ca..a52d6e66 100644
--- a/ippisite/ippidb/tests.py
+++ b/ippisite/ippidb/tests.py
@@ -488,8 +488,10 @@ class TestConvertIUPACToSMILESAndMore(TestCase):
         ]
         for iupac, dict_expected in pairs:
             dict_returned = ws.convert_iupac_to_smiles_and_inchi(iupac)
-            self.assertEqual(dict_expected, dict_returned)
-            self.assertEqual(dict_expected["smiles"], ws.convert_iupac_to_smiles(iupac))
+            self.assertEqual(dict_expected["smiles"], dict_returned["smiles"])
+            self.assertEqual(dict_expected["inchi"], dict_returned["inchi"])
+            self.assertEqual(dict_expected["stdinchi"], dict_returned["stdinchi"])
+            self.assertEqual(dict_expected["stdinchikey"], dict_returned["stdinchikey"])
 
     def test_invalide_entry(self):
         self.assertRaises(ws.EntryNotFoundError, ws.convert_iupac_to_smiles_and_inchi, '3-{1-oxo-6-[4-(piperid')
-- 
GitLab