[pywin32-checkins] pywin32/adodbapi/tests adodbapitest.py,1.2,1.3

[Vernon C. <kf...@us...>]

Update of /cvsroot/pywin32/pywin32/adodbapi/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26776

Modified Files:
	adodbapitest.py 
Log Message:
update to version 2.2.
Works on Iron Python
improved test for multiple result sets, Decimal data, user defined convertions.



Index: adodbapitest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/adodbapi/tests/adodbapitest.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** adodbapitest.py	6 Aug 2008 16:18:06 -0000	1.2
--- adodbapitest.py	29 Aug 2008 14:32:44 -0000	1.3
***************
*** 25,34 ****
  
  import unittest
! import win32com.client
  
  import adodbapi
  import adodbapitestconfig
  
! #adodbapi.verbose = True
  
  import types
--- 25,39 ----
  
  import unittest
! 
! try:
!     import win32com.client
!     win32 = True
! except ImportError:
!     win32 = False
  
  import adodbapi
  import adodbapitestconfig
  
! #adodbapi.adodbapi.verbose = True
  
  import types
***************
*** 408,419 ****
  class TestADOwithSQLServer(CommonDBTests):
      def setUp(self):
-         try:
-             conn=win32com.client.Dispatch("ADODB.Connection")
-         except:
-             self.fail('SetUpError: Is MDAC installed?')
-         try:
-             conn.Open(adodbapitestconfig.connStrSQLServer)
-         except:
-             self.fail('SetUpError: Can not connect to the testdatabase, all other tests will fail...\nAdo error:%s' % conn.Errors(0))
          self.conn=adodbapi.connect(adodbapitestconfig.connStrSQLServer)
          self.engine = 'MSSQL'
--- 413,416 ----
***************
*** 525,537 ****
  class TestADOwithAccessDB(CommonDBTests):
      def setUp(self):
!         try:
!             adoConn=win32com.client.Dispatch("ADODB.Connection")
!         except:
!             self.fail('SetUpError: Is MDAC installed?')
! 
!         try:
!             adoConn.Open(adodbapitestconfig.connStrAccess)
!         except:
!             self.fail('SetUpError: Can not connect to the testdatabase, all other tests will fail...\nAdo error:%s' % adoConn.Errors(0))
          self.engine = 'ACCESS'
  
--- 522,526 ----
  class TestADOwithAccessDB(CommonDBTests):
      def setUp(self):
!         self.conn = adodbapi.connect(adodbapitestconfig.connStrAccess)
          self.engine = 'ACCESS'
  
***************
*** 546,571 ****
              pass
          self.conn=None
!  
      def getConnection(self):
!         return adodbapi.connect(adodbapitestconfig.connStrAccess)
  
      def testOkConnect(self):
          c=adodbapi.connect(adodbapitestconfig.connStrAccess)
          assert c != None
          
  class TestADOwithMySql(CommonDBTests):
      def setUp(self):
          try:
!             adoConn=win32com.client.Dispatch("ADODB.Connection")
          except:
!             self.fail('SetUpError: Is MDAC installed?')
          try:
!             adoConn.Open(adodbapitestconfig.connStrMySql)
          except:
!             self.fail('SetUpError: Can not connect to the testdatabase, all other tests will fail...\nAdo error:%s' % adoConn.Errors(0))
!         self.engine = 'MySQL'
  
      def getConnection(self):
!         return adodbapi.connect(adodbapitestconfig.connStrMySql)
  
      def testOkConnect(self):
--- 535,565 ----
              pass
          self.conn=None
!             
      def getConnection(self):
!         return self.conn
  
      def testOkConnect(self):
          c=adodbapi.connect(adodbapitestconfig.connStrAccess)
          assert c != None
+         c.close()
          
  class TestADOwithMySql(CommonDBTests):
      def setUp(self):
+         self.conn = adodbapi.connect(adodbapitestconfig.connStrMySql)
+         self.engine = 'MySQL'
+ 
+     def tearDown(self):
          try:
!             self.conn.rollback()
          except:
!             pass
          try:
!             self.conn.close()
          except:
!             pass
!         self.conn=None
  
      def getConnection(self):
!         return self.conn
  
      def testOkConnect(self):
***************
*** 649,662 ****
      
      def testCOMDate(self):
!         t=time.localtime(time.mktime((2002,6,28,18,15,01, 4,31+28+31+30+31+28,-1)))
          # Fri, 28 Jun 2002 18:15:01 +0000
          cmd=self.tc.COMDate(t)
!         assert abs(cmd - 37435.7604282) < 1.0/24,"more than an hour wrong"
  
-     
      def testDateObjectFromCOMDate(self):
          cmd=self.tc.DateObjectFromCOMDate(37435.7604282)
!         t1=time.localtime(time.mktime((2002,6,28,18,14,01, 4,31+28+31+30+31+28,-1)))
!         t2=time.localtime(time.mktime((2002,6,28,18,16,01, 4,31+28+31+30+31+28,-1)))
          assert t1<cmd<t2,cmd
      
--- 643,656 ----
      
      def testCOMDate(self):
!         mk = time.mktime((2002,6,28,18,15,01, 4,31+28+31+30+31+28,-1))
!         t=time.localtime(mk)
          # Fri, 28 Jun 2002 18:15:01 +0000
          cmd=self.tc.COMDate(t)
!         assert abs(cmd - 37435.7604282) < 1.0/24,"%f more than an hour wrong" % cmd
  
      def testDateObjectFromCOMDate(self):
          cmd=self.tc.DateObjectFromCOMDate(37435.7604282)
!         t1=time.gmtime(time.mktime((2002,6,28,12,14,01, 4,31+28+31+30+31+28,-1)))
!         t2=time.gmtime(time.mktime((2002,6,28,12,16,01, 4,31+28+31+30+31+28,-1)))
          assert t1<cmd<t2,cmd
      
***************
*** 687,692 ****
          cmd=self.tc.COMDate(t)
          assert abs(cmd - 37435.7604282) < 1.0/24,"more than an hour wrong"
! 
!     
      def testDateObjectFromCOMDate(self):
          cmd=self.tc.DateObjectFromCOMDate(37435.7604282)
--- 681,685 ----
          cmd=self.tc.COMDate(t)
          assert abs(cmd - 37435.7604282) < 1.0/24,"more than an hour wrong"
!         
      def testDateObjectFromCOMDate(self):
          cmd=self.tc.DateObjectFromCOMDate(37435.7604282)