adding test for expanding rest method

KarrLab · Jun 10, 2019 · 3d0ad1a · 3d0ad1a
1 parent d68984e
commit 3d0ad1a
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/tests/test_rest.py b/tests/test_rest.py
@@ -96,16 +96,21 @@ def test_get_bpform_properties_errors(self):
             rv = client.post('/api/bpform/', json=dict(alphabet='dna', seq='ACGT', ph=7.))
         self.assertEqual(rv.status_code, 200)
 
-        rv = client.post('/api/bpform/', json=dict(alphabet='dna', 
-            seq='ACGT[id: "dI" | structure: "{}" | backbone-bond-atom: Monomer / N / 10 / 0 | backbone-displaced-atom: Monomer / H / 10 / 0 ]'.format(
-                'O=C1NC=NC2=C1N=CN2'
-                )))
+        rv = client.post('/api/bpform/', json=dict(alphabet='dna',
+                                                   seq=('ACGT[id: "dI"'
+                                                        ' | structure: "{}"'
+                                                        ' | backbone-bond-atom: Monomer / N / 10 / 0'
+                                                        ' | backbone-displaced-atom: Monomer / H / 10 / 0 ]').format(
+                                                       'O=C1NC=NC2=C1N=CN2'
+                                                   )))
         self.assertEqual(rv.status_code, 200)
 
-        rv = client.post('/api/bpform/', json=dict(alphabet='dna', 
-            seq='ACGT[id: "dI" | structure: "{}" | backbone-displaced-atom: Monomer / H / 10 / 0 ]'.format(
-                'O=C1NC=NC2=C1N=CN2'
-                )))
+        rv = client.post('/api/bpform/', json=dict(alphabet='dna',
+                                                   seq=('ACGT[id: "dI"'
+                                                        ' | structure: "{}"'
+                                                        ' | backbone-displaced-atom: Monomer / H / 10 / 0 ]').format(
+                                                       'O=C1NC=NC2=C1N=CN2'
+                                                   )))
         self.assertEqual(rv.status_code, 400)
 
     def test_get_alphabets(self):
@@ -121,7 +126,14 @@ def test_get_alphabet(self):
 
         rv = client.get('/api/alphabet/dna/')
         self.assertEqual(rv.status_code, 200)
-        alphabet = core.Alphabet().from_dict(rv.get_json())
+        rv_json = rv.get_json()
+        alphabet = core.Alphabet().from_dict(rv_json)
+        self.assertTrue(rv_json['monomers']['A']['binds_backbone'])
+        self.assertTrue(rv_json['monomers']['A']['binds_left'])
+        self.assertTrue(rv_json['monomers']['A']['binds_right'])
+        self.assertEqual(rv_json['monomers']['A']['mol_wt'], 135.13)
+        self.assertEqual(rv_json['monomers']['A']['formula'], {'C': 5.0, 'H': 5.0, 'N': 5.0})
+        self.assertEqual(rv_json['monomers']['A']['charge'], 0)
         self.assertTrue(dna.dna_alphabet.is_equal(alphabet))
 
         rv = client.get('/api/alphabet/lipid/')