Menu
▾
▴
[Pyscard-devel] SF.net SVN: pyscard:[476] trunk/pyscard/src/smartcard/test/framework
|
From: <lu...@us...> - 2010-06-09 15:50:19
|
Revision: 476
http://pyscard.svn.sourceforge.net/pyscard/?rev=476&view=rev
Author: ludov
Date: 2010-06-09 15:50:13 +0000 (Wed, 09 Jun 2010)
Log Message:
-----------
make pep8 happy
Modified Paths:
--------------
trunk/pyscard/src/smartcard/test/framework/testcase_readers.py
trunk/pyscard/src/smartcard/test/framework/testcase_ulist.py
Modified: trunk/pyscard/src/smartcard/test/framework/testcase_readers.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_readers.py 2010-06-09 15:42:05 UTC (rev 475)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_readers.py 2010-06-09 15:50:13 UTC (rev 476)
@@ -46,55 +46,57 @@
from smartcard import listReaders
from smartcard.scard import resourceManager
+
class testcase_readers(unittest.TestCase):
"""Test smartcard framework readers factory methods"""
def testcase_enoughreaders(self):
- self.assert_( len( readers() )>1 )
+ self.assert_(len(readers()) > 1)
def testcase_readers(self):
- foundreaders={}
+ foundreaders = {}
for reader in readers():
- foundreaders[str(reader)]=1
+ foundreaders[str(reader)] = 1
for reader in expectedReaders:
- self.assert_( foundreaders.has_key( reader ) )
+ self.assert_(foundreaders.has_key(reader))
def testcase_legacyreaders(self):
- foundreaders={}
+ foundreaders = {}
for reader in listReaders():
- foundreaders[reader]=1
+ foundreaders[reader] = 1
for reader in expectedReaders:
- self.assert_( foundreaders.has_key( reader ) )
+ self.assert_(foundreaders.has_key(reader))
def testcase_readers_in_readergroup(self):
- foundreaders={}
+ foundreaders = {}
for reader in readers(['SCard$DefaultReaders']):
- foundreaders[str(reader)]=1
+ foundreaders[str(reader)] = 1
for reader in expectedReaders:
- self.assert_( foundreaders.has_key( reader ) )
+ self.assert_(foundreaders.has_key(reader))
def testcase_readers_in_readergroup_empty(self):
- foundreaders={}
+ foundreaders = {}
for reader in readers([]):
- foundreaders[str(reader)]=1
+ foundreaders[str(reader)] = 1
for reader in expectedReaders:
- self.assert_( foundreaders.has_key( reader ) )
+ self.assert_(foundreaders.has_key(reader))
- if 'winscard'==resourceManager:
+ if 'winscard' == resourceManager:
+
def testcase_readers_in_readergroup_nonexistent(self):
- foundreaders={}
+ foundreaders = {}
for reader in readers(['dummy$group']):
- foundreaders[reader]=1
+ foundreaders[reader] = 1
for reader in expectedReaders:
- self.assert_( not foundreaders.has_key( reader ) )
- self.assertEquals( 0, len( foundreaders ) )
+ self.assert_(not foundreaders.has_key(reader))
+ self.assertEquals(0, len(foundreaders))
def testcase_readergroups(self):
- foundreadergroups={}
+ foundreadergroups = {}
for readergroup in readergroups():
- foundreadergroups[readergroup]=1
+ foundreadergroups[readergroup] = 1
for readergroup in expectedReaderGroups:
- self.assert_( foundreadergroups.has_key( readergroup ) )
+ self.assert_(foundreadergroups.has_key(readergroup))
def suite():
Modified: trunk/pyscard/src/smartcard/test/framework/testcase_ulist.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_ulist.py 2010-06-09 15:42:05 UTC (rev 475)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_ulist.py 2010-06-09 15:50:13 UTC (rev 476)
@@ -30,161 +30,155 @@
from smartcard.ulist import ulist
+
class C(ulist):
- def __onadditem__( self, item ):
+
+ def __onadditem__(self, item):
#print '+', item
pass
- def __onremoveitem__( self, item ):
+ def __onremoveitem__(self, item):
#print '-', item
pass
+
class testcase_ulist(unittest.TestCase):
"""Test smartcard.ulist."""
-
def testcase_ulist_init(self):
"""tests constructor"""
- c=C([1,2,3,3,4,5,5])
- self.assertEquals( [1,2,3,4,5], c )
+ c = C([1, 2, 3, 3, 4, 5, 5])
+ self.assertEquals([1, 2, 3, 4, 5], c)
- c=C( ['one', 'two', 'three', 'one'] )
- self.assertEquals( ['one', 'two', 'three' ], c )
+ c = C(['one', 'two', 'three', 'one'])
+ self.assertEquals(['one', 'two', 'three'], c)
-
def testcase_ulist_add(self):
"""tests l=l+other"""
- seed=[1,2,3]
- c=C(seed)
- self.assertEquals( seed, c )
+ seed = [1, 2, 3]
+ c = C(seed)
+ self.assertEquals(seed, c)
- c=c+[]
- self.assertEquals( seed, c )
+ c = c + []
+ self.assertEquals(seed, c)
- c=c+4
- self.assertEquals( seed+[4], c )
+ c = c + 4
+ self.assertEquals(seed + [4], c)
- c=c+4
- self.assertEquals( seed+[4], c )
+ c = c + 4
+ self.assertEquals(seed + [4], c)
- c=c+'word'
- self.assertEquals( seed+[4]+['word'], c )
+ c = c + 'word'
+ self.assertEquals(seed + [4] + ['word'], c)
- seed=['one', 'two', 'three']
- c=C(seed)
- self.assertEquals( seed, c )
+ seed = ['one', 'two', 'three']
+ c = C(seed)
+ self.assertEquals(seed, c)
- c=c+['four','five']
- self.assertEquals( seed+['four','five'], c )
+ c = c + ['four', 'five']
+ self.assertEquals(seed + ['four', 'five'], c)
-
-
def testcase_ulist_iadd(self):
"""tests l+=other"""
+ seed = [1, 2, 3]
+ c = C(seed)
+ self.assertEquals(seed, c)
- seed=[1,2,3]
- c=C(seed)
- self.assertEquals( seed, c )
+ c += []
+ self.assertEquals(seed, c)
- c+=[]
- self.assertEquals( seed, c )
+ c += 4
+ self.assertEquals(seed + [4], c)
- c+=4
- self.assertEquals( seed+[4], c )
+ c += 4
+ self.assertEquals(seed + [4], c)
- c+=4
- self.assertEquals( seed+[4], c )
+ c += [4, 3, 2, 1]
+ self.assertEquals(seed + [4], c)
- c+=[4,3,2,1]
- self.assertEquals( seed+[4], c )
+ c += 'word'
+ self.assertEquals(seed + [4] + ['word'], c)
- c+='word'
- self.assertEquals( seed+[4]+['word'], c )
+ seed = ['one', 'two', 'three']
+ c = C(seed)
+ self.assertEquals(seed, c)
- seed=['one', 'two', 'three']
- c=C(seed)
- self.assertEquals( seed, c )
+ c += ['four', 'five']
+ self.assertEquals(seed + ['four', 'five'], c)
- c+=['four','five']
- self.assertEquals( seed+['four','five'], c )
-
-
def testcase_ulist_radd(self):
"""tests l=other+l"""
+ seed = [1, 2, 3]
+ c = C(seed)
+ self.assertEquals(seed, c)
- seed=[1,2,3]
- c=C(seed)
- self.assertEquals( seed, c )
+ l = [] + c
+ self.assertEquals(seed, l)
- l=[]+c
- self.assertEquals( seed, l )
+ l = [3] + c
+ self.assertEquals(seed, c)
+ self.assertEquals(seed, l)
- l=[3]+c
- self.assertEquals( seed, c )
- self.assertEquals( seed, l )
+ l = [3, 3, 4, 4] + c
+ self.assertEquals(seed, c)
+ self.assertEquals(seed + [4], l)
- l=[3, 3, 4, 4]+c
- self.assertEquals( seed, c )
- self.assertEquals( seed+[4], l )
+ l = [4] + ['word'] + c
+ self.assertEquals(seed, c)
+ self.assertEquals(seed + [4] + ['word'], l)
- l=[4]+['word']+c
- self.assertEquals( seed, c )
- self.assertEquals( seed+[4]+['word'], l )
-
def testcase_ulist_append(self):
- seed=[1,2,3]
- c=C(seed)
+ seed = [1, 2, 3]
+ c = C(seed)
c.append(4)
- self.assertEquals( seed+[4], c )
+ self.assertEquals(seed + [4], c)
c.append(4)
- self.assertEquals( seed+[4], c )
+ self.assertEquals(seed + [4], c)
c.append('word')
- self.assertEquals( seed+[4]+['word'], c )
+ self.assertEquals(seed + [4] + ['word'], c)
def testcase_ulist_insert(self):
- seed=[1,2,3]
- c=C(seed)
+ seed = [1, 2, 3]
+ c = C(seed)
- c.insert( 0, 0 )
- self.assertEquals( [0]+seed, c )
+ c.insert(0, 0)
+ self.assertEquals([0] + seed, c)
- c.insert( 1, 0 )
- self.assertEquals( [0]+seed, c )
+ c.insert(1, 0)
+ self.assertEquals([0] + seed, c)
def testcase_ulist_pop(self):
- seed=[1,2,3]
- c=C(seed)
+ seed = [1, 2, 3]
+ c = C(seed)
c.pop()
- self.assertEquals( c, [1,2] )
+ self.assertEquals(c, [1, 2])
c.pop(1)
- self.assertEquals( c, [1] )
+ self.assertEquals(c, [1])
-
def testcase_ulist_remove(self):
- seed=[1,2,3]
- c=C(seed)
+ seed = [1, 2, 3]
+ c = C(seed)
- c.remove( 2 )
- self.assertEquals( c, [1,3] )
+ c.remove(2)
+ self.assertEquals(c, [1, 3])
- c.remove( 1 )
- self.assertEquals( c, [3] )
+ c.remove(1)
+ self.assertEquals(c, [3])
-
def suite():
suite1 = unittest.makeSuite(testcase_ulist)
return unittest.TestSuite((suite1))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
