Menu
▾
▴
[Pyscard-devel] SF.net SVN: pyscard:[482] trunk/pyscard/src/smartcard/test/scard
|
From: <lu...@us...> - 2010-06-09 16:35:57
|
Revision: 482
http://pyscard.svn.sourceforge.net/pyscard/?rev=482&view=rev
Author: ludov
Date: 2010-06-09 16:35:51 +0000 (Wed, 09 Jun 2010)
Log Message:
-----------
make pep8 happy
Modified Paths:
--------------
trunk/pyscard/src/smartcard/test/scard/testcase_geterrormessage.py
trunk/pyscard/src/smartcard/test/scard/testcase_listcards.py
Modified: trunk/pyscard/src/smartcard/test/scard/testcase_geterrormessage.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_geterrormessage.py 2010-06-09 16:21:13 UTC (rev 481)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_geterrormessage.py 2010-06-09 16:35:51 UTC (rev 482)
@@ -34,26 +34,28 @@
class testcase_geterrormessage(unittest.TestCase):
"""Test scard API for ATR retrieval with SCardLocateCards"""
+
def setUp(self):
- hresult, self.hcontext = SCardEstablishContext( SCARD_SCOPE_USER )
+ hresult, self.hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
self.assertEquals(hresult, 0)
def tearDown(self):
- hresult = SCardReleaseContext( self.hcontext )
+ hresult = SCardReleaseContext(self.hcontext)
self.assertEquals(hresult, 0)
def test_getErrorMessage(self):
- hresult, readers = SCardListReaders( self.hcontext, [] )
+ hresult, readers = SCardListReaders(self.hcontext, [])
self.assertEquals(hresult, 0)
- hresult = SCardReleaseContext( 123L )
- if 'win32'==sys.platform:
- self.assertEquals( (SCARD_E_INVALID_HANDLE==hresult or ERROR_INVALID_HANDLE==hresult), True )
+ hresult = SCardReleaseContext(123L)
+ if 'win32' == sys.platform:
+ self.assertEquals((SCARD_E_INVALID_HANDLE == hresult or ERROR_INVALID_HANDLE == hresult), True)
else:
- self.assertEquals( (SCARD_E_INVALID_HANDLE==hresult), True )
- self.assertEquals( ( SCardGetErrorMessage(hresult).rstrip()=='Invalid handle.'.rstrip() or
- SCardGetErrorMessage(hresult).rstrip()=='The handle is invalid.'.rstrip() ), True )
+ self.assertEquals((SCARD_E_INVALID_HANDLE == hresult), True)
+ self.assertEquals((SCardGetErrorMessage(hresult).rstrip() == 'Invalid handle.'.rstrip() or
+ SCardGetErrorMessage(hresult).rstrip() == 'The handle is invalid.'.rstrip()), True)
+
def suite():
suite1 = unittest.makeSuite(testcase_geterrormessage)
return unittest.TestSuite((suite1))
Modified: trunk/pyscard/src/smartcard/test/scard/testcase_listcards.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_listcards.py 2010-06-09 16:21:13 UTC (rev 481)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_listcards.py 2010-06-09 16:35:51 UTC (rev 482)
@@ -31,18 +31,19 @@
from smartcard.scard import *
import smartcard.guid
-if 'winscard'==resourceManager:
+if 'winscard' == resourceManager:
+
class testcase_listcards(unittest.TestCase):
"""Test scard API for ATR retrieval"""
# setup for all unit tests: establish context and introduce
# a dummy card interface
def setUp(self):
- hresult, self.hcontext = SCardEstablishContext( SCARD_SCOPE_USER )
+ hresult, self.hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
self.assertEquals(hresult, 0)
self.dummycardname = 'dummycard'
- self.dummycardATR = [ 0x3B, 0x75, 0x94, 0x00, 0x00, 0x62, 0x02, 0x02, 0x01, 0x01 ]
- self.dummycardMask = [ 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF ]
+ self.dummycardATR = [0x3B, 0x75, 0x94, 0x00, 0x00, 0x62, 0x02, 0x02, 0x01, 0x01]
+ self.dummycardMask = [0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF]
self.dummycardguid1 = smartcard.guid.strToGUID('{AD4F1667-EA75-4124-84D4-641B3B197C65}')
self.dummycardguid2 = smartcard.guid.strToGUID('{382AE95A-7C2C-449c-A179-56C6DE6FF3BC}')
testcase_listcards.__introduceinterface(self)
@@ -51,14 +52,13 @@
# dummy card interface
def tearDown(self):
testcase_listcards.__forgetinterface(self)
- hresult = SCardReleaseContext( self.hcontext )
+ hresult = SCardReleaseContext(self.hcontext)
self.assertEquals(hresult, 0)
-
# introduce a dummy card interface
# card ATR same as e-gate
def __introduceinterface(self):
- hresult = SCardForgetCardType( self.hcontext, self.dummycardname )
+ hresult = SCardForgetCardType(self.hcontext, self.dummycardname)
dummycardPrimaryGUID = self.dummycardguid1
dummycardGUIDS = self.dummycardguid1 + self.dummycardguid2
hresult = SCardIntroduceCardType(
@@ -67,85 +67,83 @@
dummycardPrimaryGUID,
dummycardGUIDS,
self.dummycardATR,
- self.dummycardMask )
+ self.dummycardMask)
self.assertEquals(hresult, 0)
# forget dummy card interface
def __forgetinterface(self):
- hresult = SCardForgetCardType( self.hcontext, self.dummycardname )
+ hresult = SCardForgetCardType(self.hcontext, self.dummycardname)
self.assertEquals(hresult, 0)
-
# locate Cryptoflex 8k v2
# Cryptoflex 8k v2 is present in standard Windows 2000
def test_listcryptoflexbyatr(self):
- slbCryptoFlex8kv2ATR = [ 0x3B, 0x95, 0x15, 0x40, 0x00, 0x68, 0x01, 0x02, 0x00, 0x00 ]
+ slbCryptoFlex8kv2ATR = [0x3B, 0x95, 0x15, 0x40, 0x00, 0x68, 0x01, 0x02, 0x00, 0x00]
slbCryptoFlex8kv2Name = ['Schlumberger Cryptoflex 8K v2']
- hresult, card = SCardListCards( self.hcontext, slbCryptoFlex8kv2ATR, [] )
+ hresult, card = SCardListCards(self.hcontext, slbCryptoFlex8kv2ATR, [])
self.assertEquals(hresult, 0)
- self.assertEquals( card, slbCryptoFlex8kv2Name )
+ self.assertEquals(card, slbCryptoFlex8kv2Name)
# locate dummy card by interface
def test_listdummycardbyguid(self):
guidstolocate = self.dummycardguid2 + self.dummycardguid1
locatedcardnames = [self.dummycardname]
- hresult, card = SCardListCards( self.hcontext, [], guidstolocate )
+ hresult, card = SCardListCards(self.hcontext, [], guidstolocate)
self.assertEquals(hresult, 0)
- self.assertEquals( card, locatedcardnames )
+ self.assertEquals(card, locatedcardnames)
-
# list our dummy card interfaces and check
# that they match the introduced interfaces
def test_listdummycardinterfaces(self):
- hresult, interfaces = SCardListInterfaces( self.hcontext, self.dummycardname )
+ hresult, interfaces = SCardListInterfaces(self.hcontext, self.dummycardname)
self.assertEquals(hresult, 0)
- self.assertEquals( 2, len(interfaces) )
- self.assertEquals( self.dummycardguid1, interfaces[0] )
- self.assertEquals( self.dummycardguid2, interfaces[1] )
+ self.assertEquals(2, len(interfaces))
+ self.assertEquals(self.dummycardguid1, interfaces[0])
+ self.assertEquals(self.dummycardguid2, interfaces[1])
# locate all cards and interfaces in the system
def test_listallcards(self):
-
# dummycard has been introduced in the test setup and
# will be removed in the test teardown. Other cards are
# the cards present by default on Windows 2000
- expectedCards = [ 'dummycard', 'GemSAFE Smart Card (8K)', 'Schlumberger Cryptoflex 4K',
- 'Schlumberger Cryptoflex 8K', 'Schlumberger Cryptoflex 8K v2' ]
- hresult, cards = SCardListCards( self.hcontext, [], [] )
+ expectedCards = ['dummycard', 'GemSAFE Smart Card (8K)',
+ 'Schlumberger Cryptoflex 4K',
+ 'Schlumberger Cryptoflex 8K', 'Schlumberger Cryptoflex 8K v2']
+ hresult, cards = SCardListCards(self.hcontext, [], [])
self.assertEquals(hresult, 0)
foundCards = {}
for i in xrange(len(cards)):
- foundCards[cards[i]]=1
+ foundCards[cards[i]] = 1
for i in expectedCards:
- self.assert_( foundCards.has_key( i ) )
+ self.assert_(foundCards.has_key(i))
# dummycard has a primary provider, other cards have no primary provider
expectedPrimaryProviderResult = {
- 'dummycard':[0,self.dummycardguid1],
- 'GemSAFE':[2,None],
- 'Schlumberger Cryptoflex 4k':[2,None],
- 'Schlumberger Cryptoflex 8k':[2,None],
- 'Schlumberger Cryptoflex 8k v2':[2,None] }
+ 'dummycard': [0, self.dummycardguid1],
+ 'GemSAFE': [2, None],
+ 'Schlumberger Cryptoflex 4k': [2, None],
+ 'Schlumberger Cryptoflex 8k': [2, None],
+ 'Schlumberger Cryptoflex 8k v2': [2, None]}
for i in xrange(len(cards)):
hresult, providername = SCardGetCardTypeProviderName(
- self.hcontext, cards[i], SCARD_PROVIDER_PRIMARY )
+ self.hcontext, cards[i], SCARD_PROVIDER_PRIMARY)
if expectedPrimaryProviderResult.has_key(cards[i]):
self.assertEquals(hresult, expectedPrimaryProviderResult[cards[i]][0])
- if hresult==0:
+ if hresult == 0:
self.assertEquals(providername, smartcard.guid.GUIDToStr(expectedPrimaryProviderResult[cards[i]][1]))
# dummycard has no CSP, other cards have a CSP
- #expectedProviderCSP = [ 2, 0, 0, 0, 0 ]
+ #expectedProviderCSP = [2, 0, 0, 0, 0]
expectedProviderCSPResult = {
- 'dummycard':[2,None],
- 'GemSAFE':[0,'Gemplus GemSAFE Card CSP v1.0'],
- 'Schlumberger Cryptoflex 4k':[0,'Schlumberger Cryptographic Service Provider'],
- 'Schlumberger Cryptoflex 8k':[0,'Schlumberger Cryptographic Service Provider'],
- 'Schlumberger Cryptoflex 8k v2':[0,'Schlumberger Cryptographic Service Provider'] }
+ 'dummycard': [2, None],
+ 'GemSAFE': [0, 'Gemplus GemSAFE Card CSP v1.0'],
+ 'Schlumberger Cryptoflex 4k': [0, 'Schlumberger Cryptographic Service Provider'],
+ 'Schlumberger Cryptoflex 8k': [0, 'Schlumberger Cryptographic Service Provider'],
+ 'Schlumberger Cryptoflex 8k v2': [0, 'Schlumberger Cryptographic Service Provider']}
for i in xrange(len(cards)):
hresult, providername = SCardGetCardTypeProviderName(
- self.hcontext, cards[i], SCARD_PROVIDER_CSP )
+ self.hcontext, cards[i], SCARD_PROVIDER_CSP)
if expectedProviderCSPResult.has_key(cards[i]):
self.assertEquals(hresult, expectedProviderCSPResult[cards[i]][0])
self.assertEquals(providername, expectedProviderCSPResult[cards[i]][1])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
