Author: johannes
Date: 2007-09-26 03:16:07 -0500 (Wed, 26 Sep 2007)
New Revision: 9782
Modified:
trunk/gnue-appserver/tests/data.py
Log:
Applied changes in appserver's api
Modified: trunk/gnue-appserver/tests/data.py
===================================================================
--- trunk/gnue-appserver/tests/data.py 2007-09-20 14:50:31 UTC (rev 9781)
+++ trunk/gnue-appserver/tests/data.py 2007-09-26 08:16:07 UTC (rev 9782)
@@ -388,7 +388,7 @@
content = {None: (u'address_person', None, None, [u'address_name'])}
rs = self.connection.query (content, None, None)
- self.assertEqual (rs.count (), 4)
+ self.assertEqual (len(rs), 4)
e = [u'James Tiberius Kirk', u'Spock', u'Leonard H. McCoy',
u'Pavel Andreievich Chekov']
e.sort ()
@@ -398,7 +398,7 @@
content = {None: (u'address_person', None, None, [u'address_name'])}
rs = self.connection.query (content, None, [{'name': u'address_name'}])
- self.assertEqual (rs.count (), 4)
+ self.assertEqual (len(rs), 4)
e = [u'James Tiberius Kirk', u'Leonard H. McCoy',
u'Pavel Andreievich Chekov', u'Spock']
self.assertEqual (self.__rsToSeq (rs, [u'address_name']), e)
@@ -407,11 +407,9 @@
rs = self.connection.query (content, None, [{'name': u'address_name',
'descending': True}])
result = []
- rec = rs.nextRecord ()
- while rec:
+ for rec in rs:
result.append ((rec.getField (u'address_name'), rec.getField
(u'address_zip')))
- rec = rs.nextRecord ()
rs.close ()
e = [(u'Spock', u'4711'),
@@ -421,6 +419,7 @@
self.assertEqual (result, e)
+ print "Simple condition ..."
# Run the query with a simple condition
cond = ['like', ['field', u'address_zip'], ['const', '%1']]
rs = self.connection.query (content, cond, [{'name': u'address_name'}])
@@ -432,6 +431,7 @@
# -------------------------------------------------------------------------
# Checking dirty reads
+ print "Dirty reads ..."
(orgCrew, orgData) = self.__getCrewMembers ()
expected = [(u'James Tiberius Kirk', u'US'),
(u'Leonard H. McCoy', u'US'),
@@ -644,8 +644,7 @@
recList = []
recData = []
- rec = resultSet.nextRecord ()
- while rec:
+ for rec in resultSet:
country = rec.getField (u'address_country')
if country is not None:
jRec = connection.findRecord (u'address_country', country, [])
@@ -656,7 +655,6 @@
recData.append ((rec.getField (u'address_name'), cCode))
recList.append (rec)
- rec = resultSet.nextRecord ()
resultSet.close ()
@@ -683,10 +681,8 @@
result = []
append = len (fields) == 1 and result.extend or result.append
- rec = rs.nextRecord ()
- while rec:
+ for rec in rs:
append ([rec.getField (f) for f in fields])
- rec = rs.nextRecord ()
rs.close ()
_______________________________________________
commit-gnue mailing list
commit-gnue@gnu.org
http://lists.gnu.org/mailman/listinfo/commit-gnue
