[Pypgsql-checkins] CVS: pypgsql/test/regression pgresult.py,1.5,1.6 pgversion.py,1.2,1.3

[Billy G. A. <bal...@us...>]

Update of /cvsroot/pypgsql/pypgsql/test/regression
In directory usw-pr-cvs1:/tmp/cvs-serv11107/test/regression

Modified Files:
	pgresult.py pgversion.py 
Log Message:
23SEP2001 bga	Updated test cases to reflect changes in the code.


Index: pgresult.py
===================================================================
RCS file: /cvsroot/pypgsql/pypgsql/test/regression/pgresult.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pgresult.py	2001/09/10 07:21:57	1.5
--- pgresult.py	2001/09/23 07:27:23	1.6
***************
*** 34,37 ****
--- 34,38 ----
  # Date      Ini Description						|
  # --------- --- ------------------------------------------------------- |
+ # 21SEP2001 bga Added check of the member types in certain test cases.	|
  # 10SEP2001 bga Added the test cases for methods.  This unit test file	|
  #		is complete (for now :-).				|
***************
*** 65,70 ****
  	self.vstr = vstr
  	self.members = ['binaryTuples', 'cmdStatus', 'cmdTuples', 'nfields',
! 			'ntuples', 'oidValue', 'resultErrorMessage',
! 			'resultStatus', 'resultType']
  	self.methods = ['clear', 'fname', 'fnumber', 'fsize', 'ftype',
  			'getisnull', 'getlength', 'getvalue']
--- 66,70 ----
  	self.vstr = vstr
  	self.members = ['binaryTuples', 'cmdStatus', 'cmdTuples', 'nfields',
! 			'ntuples', 'oidValue', 'resultStatus', 'resultType']
  	self.methods = ['clear', 'fname', 'fnumber', 'fsize', 'ftype',
  			'getisnull', 'getlength', 'getvalue']
***************
*** 95,99 ****
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'DROP', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	# Try to drop the table again.  This should raise an execption.
--- 95,99 ----
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'DROP', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	# Try to drop the table again.  This should raise an execption.
***************
*** 104,108 ****
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'COMMIT', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  
--- 104,108 ----
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'COMMIT', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  
***************
*** 111,115 ****
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'CLOSE', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  
--- 111,115 ----
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'CLOSE', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  
***************
*** 120,124 ****
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'FETCH', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
          self.assertEquals(len(self.cnx.notices), 1,
--- 120,124 ----
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'FETCH', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
          self.assertEquals(len(self.cnx.notices), 1,
***************
*** 132,136 ****
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'CLOSE', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  
--- 132,136 ----
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'CLOSE', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  
***************
*** 139,143 ****
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [1, 'FETCH', None, 2, 3, None, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  
--- 139,143 ----
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [1, 'FETCH', None, 2, 3, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  
***************
*** 147,151 ****
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'SELECT', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  
--- 147,151 ----
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'SELECT', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  
***************
*** 154,161 ****
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'MOVE', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	res = self.cnx.query("FETCH ALL FROM pgres_cursor")
! 	expected = [0, 'FETCH', None, 2, 4, None, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  
--- 154,161 ----
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'MOVE', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	res = self.cnx.query("FETCH ALL FROM pgres_cursor")
! 	expected = [0, 'FETCH', None, 2, 4, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  
***************
*** 164,168 ****
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'FETCH', None, 2, 2, None, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  
--- 164,168 ----
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'FETCH', None, 2, 2, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  
***************
*** 172,176 ****
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'SELECT', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  
--- 172,176 ----
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'SELECT', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  
***************
*** 179,183 ****
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'BEGIN', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  
--- 179,183 ----
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'BEGIN', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  
***************
*** 186,190 ****
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'SELECT', None, 2, 4, None, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  
--- 186,190 ----
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'SELECT', None, 2, 4, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  
***************
*** 196,200 ****
  	self.CheckForMethods(res)
  	cs = 'UPDATE %s' % res.cmdTuples
! 	expected = [0, cs, 1, 0, 0, None, None, 1, 3 ]
  	self.CheckMemberValues(res, expected)
  
--- 196,200 ----
  	self.CheckForMethods(res)
  	cs = 'UPDATE %s' % res.cmdTuples
! 	expected = [0, cs, 1, 0, 0, None, 1, 3 ]
  	self.CheckMemberValues(res, expected)
  
***************
*** 207,211 ****
  	# directly.  Set up things so we can call CheckMember Values()
  	cs = 'INSERT %s %s' % (res.oidValue, res.cmdTuples)
! 	expected = [0, cs, 1, 0, 0, res.oidValue, None, 1, 3 ]
  	self.assert_(res.oidValue != None,
  		     "PgResult.oidValue is None, it shouldn't be None.")
--- 207,211 ----
  	# directly.  Set up things so we can call CheckMember Values()
  	cs = 'INSERT %s %s' % (res.oidValue, res.cmdTuples)
! 	expected = [0, cs, 1, 0, 0, res.oidValue, 1, 3 ]
  	self.assert_(res.oidValue != None,
  		     "PgResult.oidValue is None, it shouldn't be None.")
***************
*** 223,227 ****
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'CREATE', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	# Try to create the table again.  This should raise an execption.
--- 223,227 ----
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'CREATE', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	# Try to create the table again.  This should raise an execption.
***************
*** 232,236 ****
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'SELECT', None, 7, 3, None, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  
--- 232,236 ----
  	self.CheckForMembers(res)
  	self.CheckForMethods(res)
! 	expected = [0, 'SELECT', None, 7, 3, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  
***************
*** 243,248 ****
  	self.vstr = vstr
  	self.members = ['binaryTuples', 'cmdStatus', 'cmdTuples', 'nfields',
! 			'ntuples', 'oidValue', 'resultErrorMessage',
! 			'resultStatus', 'resultType']
  
      def CheckMemberValues(self, res, expected):
--- 243,250 ----
  	self.vstr = vstr
  	self.members = ['binaryTuples', 'cmdStatus', 'cmdTuples', 'nfields',
! 			'ntuples', 'oidValue', 'resultStatus', 'resultType']
! 	self.memtypes= [types.IntType, types.StringType, types.IntType,
! 			types.IntType, types.IntType, types.IntType,
! 			types.IntType, types.IntType]
  
      def CheckMemberValues(self, res, expected):
***************
*** 253,259 ****
  			      (self.members[i], v, expected[i]))
  
      def CheckDropPgResult(self):
  	res = self.cnx.query("DROP TABLE pgresult_test")
! 	expected = [0, 'DROP', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
--- 255,268 ----
  			      (self.members[i], v, expected[i]))
  
+     def CheckMemberTypes(self, res, expected):
+ 	for i in range(len(self.members)):
+ 	    exec 'v = res.%s' % self.members[i]
+ 	    self.assertEquals(type(v), expected[i],
+ 			      'PgResult.%s is %s, it should be %s!' % \
+ 			      (self.members[i], type(v), expected[i]))
+ 
      def CheckDropPgResult(self):
  	res = self.cnx.query("DROP TABLE pgresult_test")
! 	expected = [0, 'DROP', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
***************
*** 268,272 ****
      def CheckEndPgResult(self):
  	res = self.cnx.query("END WORK")
! 	expected = [0, 'COMMIT', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
--- 277,281 ----
      def CheckEndPgResult(self):
  	res = self.cnx.query("END WORK")
! 	expected = [0, 'COMMIT', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
***************
*** 281,285 ****
      def CheckClosePgResult(self):
  	res = self.cnx.query("CLOSE pgres_cursor")
! 	expected = [0, 'CLOSE', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
--- 290,294 ----
      def CheckClosePgResult(self):
  	res = self.cnx.query("CLOSE pgres_cursor")
! 	expected = [0, 'CLOSE', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
***************
*** 294,298 ****
      def CheckMovePgResult(self):
  	res = self.cnx.query("MOVE BACKWARD ALL IN pgres_cursor")
! 	expected = [0, 'MOVE', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
--- 303,307 ----
      def CheckMovePgResult(self):
  	res = self.cnx.query("MOVE BACKWARD ALL IN pgres_cursor")
! 	expected = [0, 'MOVE', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
***************
*** 307,311 ****
      def CheckFetchPgResult(self):
  	res = self.cnx.query("FETCH 2 FROM pgres_cursor")
! 	expected = [0, 'FETCH', None, 2, 2, None, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  	self.assertEquals(res.fmod(0), -1,
--- 316,320 ----
      def CheckFetchPgResult(self):
  	res = self.cnx.query("FETCH 2 FROM pgres_cursor")
! 	expected = [0, 'FETCH', None, 2, 2, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  	self.assertEquals(res.fmod(0), -1,
***************
*** 337,341 ****
  				SELECT * FROM pgresult_test
  				ORDER BY f1""")
! 	expected = [0, 'SELECT', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
--- 346,350 ----
  				SELECT * FROM pgresult_test
  				ORDER BY f1""")
! 	expected = [0, 'SELECT', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
***************
*** 350,354 ****
      def CheckBeginPgResult(self):
  	res = self.cnx.query("BEGIN WORK")
! 	expected = [0, 'BEGIN', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
--- 359,363 ----
      def CheckBeginPgResult(self):
  	res = self.cnx.query("BEGIN WORK")
! 	expected = [0, 'BEGIN', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
***************
*** 363,367 ****
      def CheckSelectPgResult(self):
  	res = self.cnx.query("SELECT * FROM pgresult_test ORDER BY f1")
! 	expected = [0, 'SELECT', None, 2, 4, None, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  	self.assertEquals(res.fmod(0), -1,
--- 372,376 ----
      def CheckSelectPgResult(self):
  	res = self.cnx.query("SELECT * FROM pgresult_test ORDER BY f1")
! 	expected = [0, 'SELECT', None, 2, 4, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  	self.assertEquals(res.fmod(0), -1,
***************
*** 397,401 ****
  				WHERE f1 = 3""")
  	cs = 'UPDATE %s' % res.cmdTuples
! 	expected = [0, cs, 1, 0, 0, None, None, 1, 3 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
--- 406,410 ----
  				WHERE f1 = 3""")
  	cs = 'UPDATE %s' % res.cmdTuples
! 	expected = [0, cs, 1, 0, 0, None, 1, 3 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
***************
*** 411,418 ****
  	res = self.cnx.query("""INSERT INTO pgresult_test
  				VALUES (1, 'This is a test (1)')""")
  	# The PgResult object's members can't be tested with CheckMemberValues()
  	# directly.  Set up things so we can call CheckMember Values()
  	cs = 'INSERT %s %s' % (res.oidValue, res.cmdTuples)
! 	expected = [0, cs, 1, 0, 0, res.oidValue, None, 1, 3 ]
  	self.assert_(res.oidValue != None,
  		     "PgResult.oidValue is None, it shouldn't be None.")
--- 420,431 ----
  	res = self.cnx.query("""INSERT INTO pgresult_test
  				VALUES (1, 'This is a test (1)')""")
+ 	expected = [types.IntType, types.StringType, types.IntType,
+ 		    types.IntType, types.IntType, types.IntType, types.IntType,
+ 		    types.IntType ]
+ 	self.CheckMemberTypes(res, expected)
  	# The PgResult object's members can't be tested with CheckMemberValues()
  	# directly.  Set up things so we can call CheckMember Values()
  	cs = 'INSERT %s %s' % (res.oidValue, res.cmdTuples)
! 	expected = [0, cs, 1, 0, 0, res.oidValue, 1, 3 ]
  	self.assert_(res.oidValue != None,
  		     "PgResult.oidValue is None, it shouldn't be None.")
***************
*** 436,440 ****
  	query = "CREATE TABLE pgresult_test(f1 INT, f2 TEXT)"
  	res = self.cnx.query(query)
! 	expected = [0, 'CREATE', None, 0, 0, None, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
--- 449,453 ----
  	query = "CREATE TABLE pgresult_test(f1 INT, f2 TEXT)"
  	res = self.cnx.query(query)
! 	expected = [0, 'CREATE', None, 0, 0, None, 1, 2 ]
  	self.CheckMemberValues(res, expected)
  	self.failUnlessRaises(libpq.InterfaceError, res.fmod, 0)
***************
*** 449,453 ****
      def CheckPgResult(self):
  	res = self.cnx.query("SELECT * FROM pg_database LIMIT 3")
! 	expected = [0, 'SELECT', None, 7, 3, None, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  	# Check that fname returns the expected results
--- 462,470 ----
      def CheckPgResult(self):
  	res = self.cnx.query("SELECT * FROM pg_database LIMIT 3")
! 	expected = [types.IntType, types.StringType, types.NoneType,
! 		    types.IntType, types.IntType, types.NoneType,
! 		    types.IntType, types.IntType ]
! 	self.CheckMemberTypes(res, expected)
! 	expected = [0, 'SELECT', None, 7, 3, None, 2, 1 ]
  	self.CheckMemberValues(res, expected)
  	# Check that fname returns the expected results
***************
*** 484,489 ****
  
      def CheckSelectOfNonPrintableString(self):
  	try:
! 	    a = '\x01\x02\x03\x04'
  	    res = self.cnx.query("select %s as a" % repr(a))
  	    b = res.getvalue(0, res.fnumber('a'))
--- 501,507 ----
  
      def CheckSelectOfNonPrintableString(self):
+ 	# Note: This exercises the pgFixEsc function in pgconnection.c
  	try:
! 	    a = '\x01\x02\x03\004'
  	    res = self.cnx.query("select %s as a" % repr(a))
  	    b = res.getvalue(0, res.fnumber('a'))

Index: pgversion.py
===================================================================
RCS file: /cvsroot/pypgsql/pypgsql/test/regression/pgversion.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pgversion.py	2001/09/17 04:35:24	1.2
--- pgversion.py	2001/09/23 07:27:23	1.3
***************
*** 34,37 ****
--- 34,38 ----
  # Date      Ini Description						|
  # --------- --- ------------------------------------------------------- |
+ # 21SEP2001 bga Added check of the member types in the sanity check.	|
  # 16SEP2001 bga Change tests to reflect changes in pgversion.c.		|
  # 13SEP2001 bga Completed the test cases for PgVersion.			|
***************
*** 220,223 ****
--- 221,236 ----
      def CheckPgVersionSanity(self):
  	self.CheckForMembers(vers)
+ 
+ 	# Check the types of the members.
+ 	self.assertEquals(type(vers.version), types.StringType,
+ 			  "PgVersion.version is not a string.");
+ 	self.assertEquals(type(vers.major), types.IntType,
+ 			  "PgVersion.major is not an integer.");
+ 	self.assertEquals(type(vers.minor), types.IntType,
+ 			  "PgVersion.minor is not an integer.");
+ 	self.assertEquals(type(vers.level), types.IntType,
+ 			  "PgVersion.level is not an integer.");
+ 	self.assertEquals(type(vers.post70), types.IntType,
+ 			  "PgVersion.post70 is not an integer.");
  
  	# Build up what the attributes of the PgVersion Object should be