From f29c37b4469b38cb512234f7abbad7bdb1c83078 Mon Sep 17 00:00:00 2001
From: Tobias Schmidt <tobias.schmidt@unibas.ch>
Date: Wed, 3 Nov 2010 16:27:34 +0100
Subject: [PATCH] Revert "update msms unit test"

This reverts commit a628802a16335c1b2bfca0dfee23f3bf90ea6fc1.
---
 modules/bindings/tests/test_msms.py | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/modules/bindings/tests/test_msms.py b/modules/bindings/tests/test_msms.py
index 5720372c0..61810be55 100755
--- a/modules/bindings/tests/test_msms.py
+++ b/modules/bindings/tests/test_msms.py
@@ -7,26 +7,20 @@ class TestMSMSBindings(unittest.TestCase):
   
   def setUp(self):
     self.protein = io.LoadEntity("testfiles/testprotein.pdb")
-
-    self.num_tri=111546
-    self.num_vert=55762
-    self.ases=20051.928
-    self.asas=21574.324
+    self.num_tri=45360
+    self.num_vert=22670
+    self.ases=19336.730
+    self.asas=21179.932
 
   def testCalculateSurface(self):
-    surf=msms.CalculateSurface(self.protein,
-                               msms_env='MSMSSERVER',
-                               density=3,
-                               radius=1.4)[0]
+    surf=msms.CalculateSurface(self.protein, msms_env='MSMSSERVER')[0]
     assert self.num_vert==len(surf.GetVertexIDList()) \
        and self.num_tri==len(surf.GetTriIDList()), \
        "Number of surface vertices (%i) or triangles (%i) do not match precalculated values (%i/%i)"%(len(surf.GetVertexIDList()),len(surf.GetTriIDList()),self.num_vert,self.num_tri)
   
   def testCalculateSurfaceAres(self):
      (msms_ases, msms_asas)=msms.CalculateSurfaceArea(self.protein, \
-                                                      msms_env='MSMSSERVER',
-                                                      density=3,
-                                                      radius=1.4)
+                                                      msms_env='MSMSSERVER')
      assert self.ases==msms_ases[0] and self.asas==msms_asas[0], \
      "SASA (%f) or SESA (%f) do not match precalculated values (%f/%f)"%(msms_asas[0],msms_ases[0],self.asas,self.ases)
 
-- 
GitLab