From 70d09c5274499fcd6ea3dac713cc6a9a6bcd2734 Mon Sep 17 00:00:00 2001
From: Rafal Gumienny <guma44@gmail.com>
Date: Thu, 22 Feb 2018 17:49:23 +0100
Subject: [PATCH] test: SCHWED-3126 Updated tests for non-standard
---
modules/mol/alg/tests/test_nonstandard.py | 28 +++++++++----------
.../alg}/tests/testfiles/cbeta.pdb | 0
.../alg}/tests/testfiles/sep.pdb | 0
3 files changed, 14 insertions(+), 14 deletions(-)
rename modules/{conop => mol/alg}/tests/testfiles/cbeta.pdb (100%)
rename modules/{conop => mol/alg}/tests/testfiles/sep.pdb (100%)
diff --git a/modules/mol/alg/tests/test_nonstandard.py b/modules/mol/alg/tests/test_nonstandard.py
index 566db9a2b..c81c92479 100644
--- a/modules/mol/alg/tests/test_nonstandard.py
+++ b/modules/mol/alg/tests/test_nonstandard.py
@@ -1,5 +1,5 @@
import unittest
-from ost import conop, io, mol
+from ost import io, mol
class TestNonStandard(unittest.TestCase):
@@ -12,7 +12,7 @@ class TestNonStandard(unittest.TestCase):
c=ed.InsertChain('A')
ed.AppendResidue(c, 'SER')
- err, has_cbeta=conop.CopyConserved(tpl.residues[0], new_hdl.residues[0], ed)
+ err, has_cbeta=mol.alg.CopyConserved(tpl.residues[0], new_hdl.residues[0], ed)
self.assertTrue(err)
self.assertTrue(has_cbeta)
residues=new_hdl.residues
@@ -36,16 +36,16 @@ class TestNonStandard(unittest.TestCase):
ed.AppendResidue(c, 'GLY')
ed.AppendResidue(c, 'GLY')
ed.AppendResidue(c, 'HIS')
- err, has_cbeta=conop.CopyConserved(tpl.residues[0], new_hdl.residues[0], ed)
+ err, has_cbeta=mol.alg.CopyConserved(tpl.residues[0], new_hdl.residues[0], ed)
self.assertTrue(has_cbeta)
self.assertTrue(err)
- err, has_cbeta=conop.CopyConserved(tpl.residues[1], new_hdl.residues[1], ed)
+ err, has_cbeta=mol.alg.CopyConserved(tpl.residues[1], new_hdl.residues[1], ed)
self.assertFalse(has_cbeta)
self.assertTrue(err)
- err, has_cbeta=conop.CopyConserved(tpl.residues[2], new_hdl.residues[2], ed)
+ err, has_cbeta=mol.alg.CopyConserved(tpl.residues[2], new_hdl.residues[2], ed)
self.assertFalse(has_cbeta)
self.assertTrue(err)
- err, has_cbeta=conop.CopyConserved(tpl.residues[3], new_hdl.residues[3], ed)
+ err, has_cbeta=mol.alg.CopyConserved(tpl.residues[3], new_hdl.residues[3], ed)
self.assertTrue(has_cbeta)
self.assertTrue(err)
@@ -72,28 +72,28 @@ class TestNonStandard(unittest.TestCase):
ed.AppendResidue(c, 'MET')
# MET to MET
- err =conop.CopyResidue(tpl.residues[0], new_hdl.residues[0], ed)
+ err =mol.alg.CopyResidue(tpl.residues[0], new_hdl.residues[0], ed)
self.assertTrue(err)
#GLY to GLY
- err =conop.CopyResidue(tpl.residues[1], new_hdl.residues[1], ed)
+ err =mol.alg.CopyResidue(tpl.residues[1], new_hdl.residues[1], ed)
self.assertTrue(err)
# GLY to GLY
- err =conop.CopyResidue(tpl.residues[2], new_hdl.residues[2], ed)
+ err =mol.alg.CopyResidue(tpl.residues[2], new_hdl.residues[2], ed)
self.assertTrue(err)
#now we copy a HIS to a HIS
- err =conop.CopyResidue(tpl.residues[3], new_hdl.residues[3], ed)
+ err =mol.alg.CopyResidue(tpl.residues[3], new_hdl.residues[3], ed)
self.assertTrue(err)
# copy a GLY to a HIS
- err, has_cbeta=conop.CopyNonConserved(tpl.residues[1], new_hdl.residues[4], ed)
+ err, has_cbeta=mol.alg.CopyNonConserved(tpl.residues[1], new_hdl.residues[4], ed)
self.assertFalse(has_cbeta)
# copy a MET to a GLY
- err =conop.CopyResidue(tpl.residues[0], new_hdl.residues[5], ed)
+ err =mol.alg.CopyResidue(tpl.residues[0], new_hdl.residues[5], ed)
self.assertFalse(err)
# copy a MET to a HIS
- err =conop.CopyResidue(tpl.residues[0], new_hdl.residues[6], ed)
+ err =mol.alg.CopyResidue(tpl.residues[0], new_hdl.residues[6], ed)
self.assertFalse(err)
# copy a GLY to a MET with adding CB
- err=conop.CopyResidue(tpl.residues[1], new_hdl.residues[7], ed)
+ err=mol.alg.CopyResidue(tpl.residues[1], new_hdl.residues[7], ed)
self.assertFalse(err)
residues=new_hdl.residues
diff --git a/modules/conop/tests/testfiles/cbeta.pdb b/modules/mol/alg/tests/testfiles/cbeta.pdb
similarity index 100%
rename from modules/conop/tests/testfiles/cbeta.pdb
rename to modules/mol/alg/tests/testfiles/cbeta.pdb
diff --git a/modules/conop/tests/testfiles/sep.pdb b/modules/mol/alg/tests/testfiles/sep.pdb
similarity index 100%
rename from modules/conop/tests/testfiles/sep.pdb
rename to modules/mol/alg/tests/testfiles/sep.pdb
--
GitLab