[cclib-svn] SF.net SVN: cclib: [163] trunk/test

[<bao...@us...>]

Revision: 163
Author:   baoilleach
Date:     2006-05-27 01:24:22 -0700 (Sat, 27 May 2006)
ViewCVS:  http://svn.sourceforge.net/cclib/?rev=163&view=rev

Log Message:
-----------
Sped up the tests 70 times or so, by avoiding re-parsing the file for every test. There's no built-in way to avoid reinitialising using the unittest framework, so you have to figure out a way yourself.

Modified Paths:
--------------
    trunk/test/testGeoOpt.py
    trunk/test/testSP.py
    trunk/test/testSPun.py
Modified: trunk/test/testGeoOpt.py
===================================================================
--- trunk/test/testGeoOpt.py	2006-05-27 07:58:33 UTC (rev 162)
+++ trunk/test/testGeoOpt.py	2006-05-27 08:24:22 UTC (rev 163)
@@ -70,19 +70,19 @@
 
 class GaussianGeoOptTest(GenericGeoOptTest):
     def setUp(self):
-        self.data = getfile(Gaussian,"basicGaussian03","dvb_gopt.out")
+        self.data = data[0]
 
 class GamessUSGeoOptTest(GenericGeoOptTest):
     def setUp(self):
-        self.data = getfile(GAMESS,"basicGAMESS-US","dvb_gopt_a.out")
+        self.data = data[2]
 
 class PCGamessGeoOptTest(GenericGeoOptTest):
     def setUp(self):
-        self.data = getfile(GAMESS,"basicPCGAMESS","dvb_gopt_a.out")
-
+        self.data = data[1]
+        
 class ADFGeoOptTest(GenericGeoOptTest):
     def setUp(self):
-        self.data = getfile(ADF,"basicADF2004.01","dvb_gopt_b.adfout")
+        self.data = data[3]
 
     def testscfvaluedim(self):
         """Do the scf values have the right dimensions? 
@@ -100,12 +100,18 @@
 
 class JaguarGeoOptTest(GenericGeoOptTest):
     def setUp(self):
-        self.data = getfile(Jaguar,"basicJaguar","eg01","dvb_gopt_b.out")
+        self.data = data[4]
+        
 
 names = [ "Gaussian", "PCGamess", "GAMESS", "ADF", "Jaguar" ]
 tests = [ GaussianGeoOptTest, PCGamessGeoOptTest,
           GamessUSGeoOptTest, ADFGeoOptTest,
           JaguarGeoOptTest ]
+data = [ getfile(Gaussian,"basicGaussian03","dvb_gopt.out"),
+         getfile(GAMESS,"basicPCGAMESS","dvb_gopt_a.out"),
+         getfile(GAMESS,"basicGAMESS-US","dvb_gopt_a.out"),
+         getfile(ADF,"basicADF2004.01","dvb_gopt_b.adfout"),
+         getfile(Jaguar,"basicJaguar","eg01","dvb_gopt_b.out") ]
 
 if __name__=="__main__":
     total = errors = failures = 0

Modified: trunk/test/testSP.py
===================================================================
--- trunk/test/testSP.py	2006-05-27 07:58:33 UTC (rev 162)
+++ trunk/test/testSP.py	2006-05-27 08:24:22 UTC (rev 163)
@@ -19,19 +19,19 @@
 
 class GaussianSPTest(GenericSPTest):
     def setUp(self):
-        self.data = getfile(Gaussian,"basicGaussian03","dvb_sp.out")
+        self.data = data[0]
 
 class GamessUSSPTest(GenericSPTest):
     def setUp(self):
-        self.data = getfile(GAMESS,"basicGAMESS-US","dvb_sp.out")
+        self.data = data[1]
 
 class PCGamessSPTest(GenericSPTest):
     def setUp(self):
-        self.data = getfile(GAMESS,"basicPCGAMESS","dvb_sp.out")
+        self.data = data[2]
 
 class ADFSPTest(GenericSPTest):
     def setUp(self):
-        self.data = getfile(ADF,"basicADF2004.01","dvb_sp_b.adfout")
+        self.data = data[3]
     
     def testdimaooverlaps(self):
         """Are the dims of the overlap matrix consistent with nbasis?"""
@@ -41,6 +41,10 @@
 names = [ "Gaussian", "PCGamess", "GAMESS", "ADF", "Jaguar" ]
 tests = [ GaussianSPTest, PCGamessSPTest,
           GamessUSSPTest, ADFSPTest ]
+data = [getfile(Gaussian,"basicGaussian03","dvb_sp.out"),
+        getfile(GAMESS,"basicGAMESS-US","dvb_sp.out"),
+        getfile(GAMESS,"basicPCGAMESS","dvb_sp.out"),
+        getfile(ADF,"basicADF2004.01","dvb_sp_b.adfout")]
               
 if __name__=="__main__":
     total = errors = failures = 0

Modified: trunk/test/testSPun.py
===================================================================
--- trunk/test/testSPun.py	2006-05-27 07:58:33 UTC (rev 162)
+++ trunk/test/testSPun.py	2006-05-27 08:24:22 UTC (rev 163)
@@ -22,19 +22,19 @@
 
 class GaussianSPunTest(GenericSPunTest):
     def setUp(self):
-        self.data = getfile(Gaussian,"basicGaussian03","dvb_un_sp.out")
+        self.data = data[0]
 
 class GamessUSSPunTest(GenericSPunTest):
     def setUp(self):
-        self.data = getfile(GAMESS,"basicGAMESS-US","dvb_un_sp.out")
+        self.data = data[1]
 
 class PCGamessSPunTest(GenericSPunTest):
     def setUp(self):
-        self.data = getfile(GAMESS,"basicPCGAMESS","dvb_un_sp.out")
+        self.data = data[2]
 
 class ADFSPunTest(GenericSPunTest):
     def setUp(self):
-        self.data = getfile(ADF,"basicADF2004.01","dvb_un_sp.adfout")
+        self.data = data[3]
 
     def testdimaooverlaps(self):
         """Are the dims of the overlap matrix consistent with nbasis?"""
@@ -45,6 +45,10 @@
 names = [ "Gaussian", "PCGamess", "GAMESS", "ADF" ]
 tests = [ GaussianSPunTest, PCGamessSPunTest,
           GamessUSSPunTest, ADFSPunTest ]
+data = [ getfile(Gaussian,"basicGaussian03","dvb_un_sp.out"),
+         getfile(GAMESS,"basicGAMESS-US","dvb_un_sp.out"),
+         getfile(GAMESS,"basicPCGAMESS","dvb_un_sp.out"),
+         getfile(ADF,"basicADF2004.01","dvb_un_sp.adfout") ]
               
 if __name__=="__main__":
     total = errors = failures = 0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.