[Python-checkins] python/dist/src/Lib/bsddb/test test_basics.py, 1.8, 1.9

[greg at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/bsddb/test
In directory sc8-pr-cvs1:/tmp/cvs-serv1442/bsddb/test

Modified Files:
	test_basics.py 
Log Message:
bsddb3 4.2.2, adds DBCursor.get_current_size() method to return the length
of the current value without reading the value itself.


Index: test_basics.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_basics.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test_basics.py	21 Sep 2003 00:08:14 -0000	1.8
--- test_basics.py	1 Oct 2003 06:48:51 -0000	1.9
***************
*** 50,53 ****
--- 50,55 ----
      envsetflags  = 0
  
+     _numKeys      = 1002    # PRIVATE.  NOTE: must be an even value
+ 
      def setUp(self):
          if self.useEnv:
***************
*** 107,121 ****
  
  
!     def populateDB(self):
          d = self.d
!         for x in range(500):
!             key = '%04d' % (1000 - x)  # insert keys in reverse order
              data = self.makeData(key)
!             d.put(key, data)
  
!         for x in range(500):
              key = '%04d' % x  # and now some in forward order
              data = self.makeData(key)
!             d.put(key, data)
  
          num = len(d)
--- 109,129 ----
  
  
!     def populateDB(self, _txn=None):
          d = self.d
! 
!         for x in range(self._numKeys/2):
!             key = '%04d' % (self._numKeys - x)  # insert keys in reverse order
              data = self.makeData(key)
!             d.put(key, data, _txn)
  
!         d.put('empty value', '', _txn)
! 
!         for x in range(self._numKeys/2-1):
              key = '%04d' % x  # and now some in forward order
              data = self.makeData(key)
!             d.put(key, data, _txn)
! 
!         if _txn:
!             _txn.commit()
  
          num = len(d)
***************
*** 237,254 ****
                  print data
  
!         assert len(d) == 1000
          keys = d.keys()
!         assert len(keys) == 1000
          assert type(keys) == type([])
  
          d['new record'] = 'a new record'
!         assert len(d) == 1001
          keys = d.keys()
!         assert len(keys) == 1001
  
          d['new record'] = 'a replacement record'
!         assert len(d) == 1001
          keys = d.keys()
!         assert len(keys) == 1001
  
          if verbose:
--- 245,262 ----
                  print data
  
!         assert len(d) == self._numKeys
          keys = d.keys()
!         assert len(keys) == self._numKeys
          assert type(keys) == type([])
  
          d['new record'] = 'a new record'
!         assert len(d) == self._numKeys+1
          keys = d.keys()
!         assert len(keys) == self._numKeys+1
  
          d['new record'] = 'a replacement record'
!         assert len(d) == self._numKeys+1
          keys = d.keys()
!         assert len(keys) == self._numKeys+1
  
          if verbose:
***************
*** 262,266 ****
  
          items = d.items()
!         assert len(items) == 1001
          assert type(items) == type([])
          assert type(items[0]) == type(())
--- 270,274 ----
  
          items = d.items()
!         assert len(items) == self._numKeys+1
          assert type(items) == type([])
          assert type(items[0]) == type(())
***************
*** 272,276 ****
  
          values = d.values()
!         assert len(values) == 1001
          assert type(values) == type([])
  
--- 280,284 ----
  
          values = d.values()
!         assert len(values) == self._numKeys+1
          assert type(values) == type([])
  
***************
*** 294,298 ****
              txn = None
          c = self.d.cursor(txn=txn)
! 
          rec = c.first()
          count = 0
--- 302,306 ----
              txn = None
          c = self.d.cursor(txn=txn)
!         
          rec = c.first()
          count = 0
***************
*** 310,315 ****
                  else:
                      self.fail("unexpected DBNotFoundError")
! 
!         assert count == 1000
  
  
--- 318,324 ----
                  else:
                      self.fail("unexpected DBNotFoundError")
!             assert c.get_current_size() == len(c.current()[1]), "%s != len(%r)" % (c.get_current_size(), c.current()[1])
!         
!         assert count == self._numKeys
  
  
***************
*** 330,334 ****
                      self.fail("unexpected DBNotFoundError")
  
!         assert count == 1000
  
          rec = c.set('0505')
--- 339,343 ----
                      self.fail("unexpected DBNotFoundError")
  
!         assert count == self._numKeys
  
          rec = c.set('0505')
***************
*** 337,341 ****
--- 346,356 ----
          assert rec[0] == '0505'
          assert rec[1] == self.makeData('0505')
+         assert c.get_current_size() == len(rec[1])
  
+         # make sure we get empty values properly
+         rec = c.set('empty value')
+         assert rec[1] == ''
+         assert c.get_current_size() == 0
+         
          try:
              n = c.set('bad key')
***************
*** 576,596 ****
  
      def populateDB(self):
-         d = self.d
          txn = self.env.txn_begin()
!         for x in range(500):
!             key = '%04d' % (1000 - x)  # insert keys in reverse order
!             data = self.makeData(key)
!             d.put(key, data, txn)
! 
!         for x in range(500):
!             key = '%04d' % x  # and now some in forward order
!             data = self.makeData(key)
!             d.put(key, data, txn)
! 
!         txn.commit()
! 
!         num = len(d)
!         if verbose:
!             print "created %d records" % num
  
          self.txn = self.env.txn_begin()
--- 591,596 ----
  
      def populateDB(self):
          txn = self.env.txn_begin()
!         BasicTestCase.populateDB(self, _txn=txn)
  
          self.txn = self.env.txn_begin()
***************
*** 627,631 ****
                  print rec
              rec = c.next()
!         assert count == 1001
  
          c.close()                # Cursors *MUST* be closed before commit!
--- 627,631 ----
                  print rec
              rec = c.next()
!         assert count == self._numKeys+1
  
          c.close()                # Cursors *MUST* be closed before commit!
***************
*** 856,860 ****
                  print rec
              rec = c1.next()
!         assert count == 1000
  
          count = 0
--- 856,860 ----
                  print rec
              rec = c1.next()
!         assert count == self._numKeys
  
          count = 0