Menu
▾
▴
pyscard-devel
|
From: <lu...@us...> - 2009-01-13 09:57:38
|
Revision: 253
http://pyscard.svn.sourceforge.net/pyscard/?rev=253&view=rev
Author: ludov
Date: 2009-01-13 09:57:28 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
accept T=0 ot T=1 cards
Modified Paths:
--------------
trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py
trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py
trunk/pyscard/src/smartcard/test/scard/testcase_transaction.py
Modified: trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py 2009-01-13 09:27:37 UTC (rev 252)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py 2009-01-13 09:57:28 UTC (rev 253)
@@ -59,7 +59,7 @@
def _getATR(self, r):
if r<len(expectedATRs) and []!=expectedATRs[r]:
hresult, hcard, dwActiveProtocol = SCardConnect(
- self.hcontext, self.readers[r], SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 )
+ self.hcontext, self.readers[r], SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1)
self.assertEquals(hresult, 0)
try:
Modified: trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py 2009-01-13 09:27:37 UTC (rev 252)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py 2009-01-13 09:57:28 UTC (rev 253)
@@ -60,7 +60,7 @@
def _getAttrib(self, r):
if r<len(expectedATRs) and []!=expectedATRs[r]:
hresult, hcard, dwActiveProtocol = SCardConnect(
- self.hcontext, self.readers[r], SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 )
+ self.hcontext, self.readers[r], SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1)
self.assertEquals(hresult, 0)
try:
Modified: trunk/pyscard/src/smartcard/test/scard/testcase_transaction.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_transaction.py 2009-01-13 09:27:37 UTC (rev 252)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_transaction.py 2009-01-13 09:57:28 UTC (rev 253)
@@ -60,7 +60,7 @@
def _transaction(self, r):
if r<len(expectedATRs) and []!=expectedATRs[r]:
hresult, hcard, dwActiveProtocol = SCardConnect(
- self.hcontext, self.readers[r], SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 )
+ self.hcontext, self.readers[r], SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1)
self.assertEquals(hresult, 0)
try:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lu...@us...> - 2009-03-01 16:39:33
|
Revision: 271
http://pyscard.svn.sourceforge.net/pyscard/?rev=271&view=rev
Author: ludov
Date: 2009-03-01 16:39:27 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
check that all return codes are defined as a symbol
Modified Paths:
--------------
trunk/pyscard/src/smartcard/test/scard/testsuite_scard.py
Added Paths:
-----------
trunk/pyscard/src/smartcard/test/scard/testcase_returncodes.py
Added: trunk/pyscard/src/smartcard/test/scard/testcase_returncodes.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_returncodes.py (rev 0)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_returncodes.py 2009-03-01 16:39:27 UTC (rev 271)
@@ -0,0 +1,110 @@
+#! /usr/bin/env python
+"""Unit tests for return codes
+
+This test case can be executed individually, or with all other test cases
+thru testsuite_scard.py.
+
+__author__ = "http://www.gemalto.com"
+
+Copyright 2009 gemalto
+Author: Ludovic Rousseau, mailto:lud...@fr...
+
+This file is part of pyscard.
+
+pyscard is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+pyscard is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with pyscard; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+"""
+
+
+import unittest
+from smartcard.scard import *
+import sys
+
+
+class testcase_returncodes(unittest.TestCase):
+ """Test scard API for return codes """
+ def test_getReturnCodes(self):
+ errors = (
+ SCARD_S_SUCCESS ,
+ SCARD_F_INTERNAL_ERROR ,
+ SCARD_E_CANCELLED ,
+ SCARD_E_INVALID_HANDLE ,
+ SCARD_E_INVALID_PARAMETER ,
+ SCARD_E_INVALID_TARGET ,
+ SCARD_E_NO_MEMORY ,
+ SCARD_F_WAITED_TOO_LONG ,
+ SCARD_E_INSUFFICIENT_BUFFER ,
+ SCARD_E_UNKNOWN_READER ,
+ SCARD_E_TIMEOUT ,
+ SCARD_E_SHARING_VIOLATION ,
+ SCARD_E_NO_SMARTCARD ,
+ SCARD_E_UNKNOWN_CARD ,
+ SCARD_E_CANT_DISPOSE ,
+ SCARD_E_PROTO_MISMATCH ,
+ SCARD_E_NOT_READY ,
+ SCARD_E_INVALID_VALUE ,
+ SCARD_E_SYSTEM_CANCELLED ,
+ SCARD_F_COMM_ERROR ,
+ SCARD_F_UNKNOWN_ERROR ,
+ SCARD_E_INVALID_ATR ,
+ SCARD_E_NOT_TRANSACTED ,
+ SCARD_E_READER_UNAVAILABLE ,
+ SCARD_E_PCI_TOO_SMALL ,
+ SCARD_E_READER_UNSUPPORTED ,
+ SCARD_E_DUPLICATE_READER ,
+ SCARD_E_CARD_UNSUPPORTED ,
+ SCARD_E_NO_SERVICE ,
+ SCARD_E_SERVICE_STOPPED ,
+ SCARD_E_UNEXPECTED ,
+ SCARD_E_ICC_INSTALLATION ,
+ SCARD_E_ICC_CREATEORDER ,
+ SCARD_E_UNSUPPORTED_FEATURE ,
+ SCARD_E_DIR_NOT_FOUND ,
+ SCARD_E_FILE_NOT_FOUND ,
+ SCARD_E_NO_DIR ,
+ SCARD_E_NO_FILE ,
+ SCARD_E_NO_ACCESS ,
+ SCARD_E_WRITE_TOO_MANY ,
+ SCARD_E_BAD_SEEK ,
+ SCARD_E_INVALID_CHV ,
+ SCARD_E_UNKNOWN_RES_MNG ,
+ SCARD_E_NO_SUCH_CERTIFICATE ,
+ SCARD_E_CERTIFICATE_UNAVAILABLE ,
+ SCARD_E_NO_READERS_AVAILABLE ,
+ SCARD_E_COMM_DATA_LOST ,
+ SCARD_E_NO_KEY_CONTAINER ,
+ SCARD_E_SERVER_TOO_BUSY ,
+ SCARD_W_UNSUPPORTED_CARD ,
+ SCARD_W_UNRESPONSIVE_CARD ,
+ SCARD_W_UNPOWERED_CARD ,
+ SCARD_W_RESET_CARD ,
+ SCARD_W_REMOVED_CARD ,
+ SCARD_W_SECURITY_VIOLATION ,
+ SCARD_W_WRONG_CHV ,
+ SCARD_W_CHV_BLOCKED ,
+ SCARD_W_EOF ,
+ SCARD_W_CANCELLED_BY_USER ,
+ SCARD_W_CARD_NOT_AUTHENTICATED ,
+ )
+ #for e in errors:
+ # print hex((e+0x100000000) & 0xFFFFFFFF)
+
+def suite():
+ suite1 = unittest.makeSuite(testcase_returncodes)
+ return unittest.TestSuite((suite1))
+
+
+if __name__ == '__main__':
+ unittest.main()
+
Property changes on: trunk/pyscard/src/smartcard/test/scard/testcase_returncodes.py
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/pyscard/src/smartcard/test/scard/testsuite_scard.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testsuite_scard.py 2009-02-26 10:37:17 UTC (rev 270)
+++ trunk/pyscard/src/smartcard/test/scard/testsuite_scard.py 2009-03-01 16:39:27 UTC (rev 271)
@@ -39,6 +39,7 @@
'testcase_listcards',
'testcase_locatecards',
'testcase_readergroups',
+ 'testcase_returncodes',
'testcase_transaction' )
testsuite_scard = unittest.TestSuite()
for module in map(__import__, modules_to_test):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lu...@us...> - 2010-06-09 16:21:19
|
Revision: 481
http://pyscard.svn.sourceforge.net/pyscard/?rev=481&view=rev
Author: ludov
Date: 2010-06-09 16:21:13 +0000 (Wed, 09 Jun 2010)
Log Message:
-----------
make pep8 happy
Modified Paths:
--------------
trunk/pyscard/src/smartcard/test/scard/testcase_locatecards.py
trunk/pyscard/src/smartcard/test/scard/testcase_readergroups.py
trunk/pyscard/src/smartcard/test/scard/testcase_returncodes.py
trunk/pyscard/src/smartcard/test/scard/testcase_transaction.py
trunk/pyscard/src/smartcard/test/scard/testsuite_scard.py
Modified: trunk/pyscard/src/smartcard/test/scard/testcase_locatecards.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_locatecards.py 2010-06-09 16:16:10 UTC (rev 480)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_locatecards.py 2010-06-09 16:21:13 UTC (rev 481)
@@ -45,65 +45,66 @@
class testcase_locatecards(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_locateCards(self):
- hresult, readers = SCardListReaders( self.hcontext, [] )
+ hresult, readers = SCardListReaders(self.hcontext, [])
self.assertEquals(hresult, 0)
- foundReaders={}
+ foundReaders = {}
for reader in readers:
- foundReaders[reader]=1
+ foundReaders[reader] = 1
for reader in expectedReaders:
- self.assert_( foundReaders.has_key( reader ) )
+ self.assert_(foundReaders.has_key(reader))
- if 'winscard'==resourceManager:
- hresult, cards = SCardListCards( self.hcontext, [], [] )
+ if 'winscard' == resourceManager:
+ hresult, cards = SCardListCards(self.hcontext, [], [])
self.assertEquals(hresult, 0)
readerstates = []
for i in xrange(len(readers)):
- readerstates += [ (readers[i], SCARD_STATE_UNAWARE ) ]
+ readerstates += [(readers[i], SCARD_STATE_UNAWARE)]
- hresult, newstates = SCardLocateCards( self.hcontext, cards, readerstates )
+ hresult, newstates = SCardLocateCards(self.hcontext, cards, readerstates)
self.assertEquals(hresult, 0)
- dictexpectedreaders={}
+ dictexpectedreaders = {}
for reader in expectedReaders:
- dictexpectedreaders[reader]=1
+ dictexpectedreaders[reader] = 1
for reader, eventstate, atr in newstates:
- if dictexpectedreaders.has_key( reader ) and []!=expectedATRinReader[reader]:
- self.assertEquals( expectedATRinReader[reader], atr )
- self.assert_( eventstate & SCARD_STATE_PRESENT )
- self.assert_( eventstate & SCARD_STATE_CHANGED )
+ if dictexpectedreaders.has_key(reader) and [] != expectedATRinReader[reader]:
+ self.assertEquals(expectedATRinReader[reader], atr)
+ self.assert_(eventstate & SCARD_STATE_PRESENT)
+ self.assert_(eventstate & SCARD_STATE_CHANGED)
# 10ms delay, so that time-out always occurs
- hresult, newstates = SCardGetStatusChange( self.hcontext, 10, newstates )
- self.assertEquals( hresult, SCARD_E_TIMEOUT )
- self.assertEquals( SCardGetErrorMessage(hresult), 'The user-specified timeout value has expired. ' )
+ hresult, newstates = SCardGetStatusChange(self.hcontext, 10, newstates)
+ self.assertEquals(hresult, SCARD_E_TIMEOUT)
+ self.assertEquals(SCardGetErrorMessage(hresult), 'The user-specified timeout value has expired. ')
- elif 'pcsclite'==resourceManager:
+ elif 'pcsclite' == resourceManager:
readerstates = []
for i in xrange(len(readers)):
- readerstates += [ (readers[i], SCARD_STATE_UNAWARE ) ]
+ readerstates += [(readers[i], SCARD_STATE_UNAWARE)]
- hresult, newstates = SCardGetStatusChange( self.hcontext, 0, readerstates )
+ hresult, newstates = SCardGetStatusChange(self.hcontext, 0, readerstates)
self.assertEquals(hresult, 0)
- dictexpectedreaders={}
+ dictexpectedreaders = {}
for reader in expectedReaders:
- dictexpectedreaders[reader]=1
+ dictexpectedreaders[reader] = 1
for reader, eventstate, atr in newstates:
- if dictexpectedreaders.has_key( reader ) and []!=expectedATRinReader[reader]:
- self.assertEquals( expectedATRinReader[reader], atr )
- self.assert_( eventstate & SCARD_STATE_PRESENT )
- self.assert_( eventstate & SCARD_STATE_CHANGED )
+ if dictexpectedreaders.has_key(reader) and [] != expectedATRinReader[reader]:
+ self.assertEquals(expectedATRinReader[reader], atr)
+ self.assert_(eventstate & SCARD_STATE_PRESENT)
+ self.assert_(eventstate & SCARD_STATE_CHANGED)
def suite():
Modified: trunk/pyscard/src/smartcard/test/scard/testcase_readergroups.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_readergroups.py 2010-06-09 16:16:10 UTC (rev 480)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_readergroups.py 2010-06-09 16:21:13 UTC (rev 481)
@@ -45,78 +45,77 @@
expectedGroups = ['SCard$DefaultReaders']
+
class testcase_readergroups(unittest.TestCase):
"""Test scard reader groups API"""
+
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_listReaders(self):
# list current readers and compare with expected list
- hresult, readers = SCardListReaders( self.hcontext, [] )
+ hresult, readers = SCardListReaders(self.hcontext, [])
self.assertEquals(hresult, 0)
for i in xrange(len(expectedReaders)):
- self.assertEquals( readers[i], expectedReaders[i] )
+ self.assertEquals(readers[i], expectedReaders[i])
-
# list current reader groups and compare with expected list
- hresult, readerGroups = SCardListReaderGroups( self.hcontext )
+ hresult, readerGroups = SCardListReaderGroups(self.hcontext)
self.assertEquals(hresult, 0)
for i in xrange(len(expectedGroups)):
- self.assertEquals( readerGroups[i], expectedGroups[i] )
+ self.assertEquals(readerGroups[i], expectedGroups[i])
- if 'winscard'==resourceManager:
+ if 'winscard' == resourceManager:
# add a new group
newgroup = 'SCard$MyOwnGroup'
expectedGroups.append(newgroup)
- hresult = SCardIntroduceReaderGroup( self.hcontext, newgroup )
+ hresult = SCardIntroduceReaderGroup(self.hcontext, newgroup)
self.assertEquals(hresult, 0)
dummyreader = readers[0] + ' alias'
- hresult = SCardIntroduceReader( self.hcontext, dummyreader, readers[0] )
+ hresult = SCardIntroduceReader(self.hcontext, dummyreader, readers[0])
self.assertEquals(hresult, 0)
- hresult = SCardAddReaderToGroup( self.hcontext, dummyreader, newgroup )
+ hresult = SCardAddReaderToGroup(self.hcontext, dummyreader, newgroup)
self.assertEquals(hresult, 0)
- hresult, readerGroups = SCardListReaderGroups( self.hcontext )
+ hresult, readerGroups = SCardListReaderGroups(self.hcontext)
self.assertEquals(hresult, 0)
for i in xrange(len(expectedGroups)):
- self.assertEquals( readerGroups[i], expectedGroups[i] )
+ self.assertEquals(readerGroups[i], expectedGroups[i])
-
# list readers in new group
- hresult, newreaders = SCardListReaders( self.hcontext, [newgroup] )
+ hresult, newreaders = SCardListReaders(self.hcontext, [newgroup])
self.assertEquals(hresult, 0)
- self.assertEquals( newreaders[0], dummyreader )
+ self.assertEquals(newreaders[0], dummyreader)
# remove reader from new group
- hresult = SCardRemoveReaderFromGroup( self.hcontext, dummyreader, newgroup )
+ hresult = SCardRemoveReaderFromGroup(self.hcontext, dummyreader, newgroup)
self.assertEquals(hresult, 0)
- hresult, readerGroups = SCardListReaderGroups( self.hcontext )
+ hresult, readerGroups = SCardListReaderGroups(self.hcontext)
self.assertEquals(hresult, 0)
expectedGroups.remove(newgroup)
for i in xrange(len(expectedGroups)):
- self.assertEquals( readerGroups[i], expectedGroups[i] )
+ self.assertEquals(readerGroups[i], expectedGroups[i])
- hresult = SCardForgetReaderGroup( self.hcontext, newgroup )
+ hresult = SCardForgetReaderGroup(self.hcontext, newgroup)
self.assertEquals(hresult, 0)
- hresult, readerGroups = SCardListReaderGroups( self.hcontext )
+ hresult, readerGroups = SCardListReaderGroups(self.hcontext)
self.assertEquals(hresult, 0)
for i in xrange(len(expectedGroups)):
- self.assertEquals( readerGroups[i], expectedGroups[i] )
+ self.assertEquals(readerGroups[i], expectedGroups[i])
- hresult = SCardForgetReader( self.hcontext, dummyreader)
+ hresult = SCardForgetReader(self.hcontext, dummyreader)
self.assertEquals(hresult, 0)
Modified: trunk/pyscard/src/smartcard/test/scard/testcase_returncodes.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_returncodes.py 2010-06-09 16:16:10 UTC (rev 480)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_returncodes.py 2010-06-09 16:21:13 UTC (rev 481)
@@ -34,8 +34,9 @@
class testcase_returncodes(unittest.TestCase):
"""Test scard API for return codes """
+
def test_getReturnCodes(self):
- errors = (
+ errors = (
SCARD_S_SUCCESS,
SCARD_F_INTERNAL_ERROR,
SCARD_E_CANCELLED,
@@ -100,6 +101,7 @@
#for e in errors:
# print hex((e+0x100000000) & 0xFFFFFFFF)
+
def suite():
suite1 = unittest.makeSuite(testcase_returncodes)
return unittest.TestSuite((suite1))
Modified: trunk/pyscard/src/smartcard/test/scard/testcase_transaction.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_transaction.py 2010-06-09 16:16:10 UTC (rev 480)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_transaction.py 2010-06-09 16:21:13 UTC (rev 481)
@@ -43,54 +43,52 @@
sys.exit()
-
class testcase_transaction(unittest.TestCase):
"""Test scard API for SCardBegin/EndTransaction"""
+
def setUp(self):
- hresult, self.hcontext = SCardEstablishContext( SCARD_SCOPE_USER )
+ hresult, self.hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
self.assertEquals(hresult, 0)
- hresult, self.readers = SCardListReaders( self.hcontext, [] )
+ hresult, self.readers = SCardListReaders(self.hcontext, [])
self.assertEquals(hresult, 0)
def tearDown(self):
- hresult = SCardReleaseContext( self.hcontext )
+ hresult = SCardReleaseContext(self.hcontext)
self.assertEquals(hresult, 0)
-
def _transaction(self, r):
- if r<len(expectedATRs) and []!=expectedATRs[r]:
+ if r < len(expectedATRs) and [] != expectedATRs[r]:
hresult, hcard, dwActiveProtocol = SCardConnect(
self.hcontext, self.readers[r], SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1)
self.assertEquals(hresult, 0)
try:
- hresult = SCardBeginTransaction( hcard )
+ hresult = SCardBeginTransaction(hcard)
self.assertEquals(hresult, 0)
- hresult, reader, state, protocol, atr = SCardStatus( hcard )
+ hresult, reader, state, protocol, atr = SCardStatus(hcard)
self.assertEquals(hresult, 0)
- self.assertEquals( reader, expectedReaders[r] )
- self.assertEquals( atr, expectedATRs[r] )
+ self.assertEquals(reader, expectedReaders[r])
+ self.assertEquals(atr, expectedATRs[r])
- hresult = SCardEndTransaction( hcard, SCARD_LEAVE_CARD )
+ hresult = SCardEndTransaction(hcard, SCARD_LEAVE_CARD)
self.assertEquals(hresult, 0)
finally:
- hresult = SCardDisconnect( hcard, SCARD_UNPOWER_CARD )
+ hresult = SCardDisconnect(hcard, SCARD_UNPOWER_CARD)
self.assertEquals(hresult, 0)
-
def test_transaction_reader0(self):
- testcase_transaction._transaction(self,0)
+ testcase_transaction._transaction(self, 0)
def test_transaction_reader1(self):
- testcase_transaction._transaction(self,1)
+ testcase_transaction._transaction(self, 1)
def test_transaction_reader2(self):
- testcase_transaction._transaction(self,2)
+ testcase_transaction._transaction(self, 2)
def test_transaction_reader3(self):
- testcase_transaction._transaction(self,3)
+ testcase_transaction._transaction(self, 3)
def suite():
Modified: trunk/pyscard/src/smartcard/test/scard/testsuite_scard.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testsuite_scard.py 2010-06-09 16:16:10 UTC (rev 480)
+++ trunk/pyscard/src/smartcard/test/scard/testsuite_scard.py 2010-06-09 16:21:13 UTC (rev 481)
@@ -31,6 +31,7 @@
sys.path += ['..']
import configcheck
+
def suite():
modules_to_test = (
'testcase_getatr',
@@ -40,7 +41,7 @@
'testcase_locatecards',
'testcase_readergroups',
'testcase_returncodes',
- 'testcase_transaction' )
+ 'testcase_transaction')
testsuite_scard = unittest.TestSuite()
for module in map(__import__, modules_to_test):
testsuite_scard.addTest(unittest.findTestCases(module))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <lu...@us...> - 2010-06-09 16:39:50
|
Revision: 483
http://pyscard.svn.sourceforge.net/pyscard/?rev=483&view=rev
Author: ludov
Date: 2010-06-09 16:39:44 +0000 (Wed, 09 Jun 2010)
Log Message:
-----------
make pep8 happy
Modified Paths:
--------------
trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py
trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py
Modified: trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py 2010-06-09 16:35:51 UTC (rev 482)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_getatr.py 2010-06-09 16:39:44 UTC (rev 483)
@@ -45,45 +45,44 @@
class testcase_getATR(unittest.TestCase):
"""Test scard API for ATR retrieval"""
+
def setUp(self):
- hresult, self.hcontext = SCardEstablishContext( SCARD_SCOPE_USER )
+ hresult, self.hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
self.assertEquals(hresult, 0)
- hresult, self.readers = SCardListReaders( self.hcontext, [] )
+ hresult, self.readers = SCardListReaders(self.hcontext, [])
self.assertEquals(hresult, 0)
def tearDown(self):
- hresult = SCardReleaseContext( self.hcontext )
+ hresult = SCardReleaseContext(self.hcontext)
self.assertEquals(hresult, 0)
-
def _getATR(self, r):
- if r<len(expectedATRs) and []!=expectedATRs[r]:
+ if r < len(expectedATRs) and [] != expectedATRs[r]:
hresult, hcard, dwActiveProtocol = SCardConnect(
self.hcontext, self.readers[r], SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1)
self.assertEquals(hresult, 0)
try:
- hresult, reader, state, protocol, atr = SCardStatus( hcard )
+ hresult, reader, state, protocol, atr = SCardStatus(hcard)
self.assertEquals(hresult, 0)
- self.assertEquals( reader, expectedReaders[r] )
- self.assertEquals( atr, expectedATRs[r] )
+ self.assertEquals(reader, expectedReaders[r])
+ self.assertEquals(atr, expectedATRs[r])
finally:
- hresult = SCardDisconnect( hcard, SCARD_UNPOWER_CARD )
+ hresult = SCardDisconnect(hcard, SCARD_UNPOWER_CARD)
self.assertEquals(hresult, 0)
-
def test_getATR0(self):
- testcase_getATR._getATR(self,0)
+ testcase_getATR._getATR(self, 0)
def test_getATR1(self):
- testcase_getATR._getATR(self,1)
+ testcase_getATR._getATR(self, 1)
def test_getATR2(self):
- testcase_getATR._getATR(self,2)
+ testcase_getATR._getATR(self, 2)
def test_getATR3(self):
- testcase_getATR._getATR(self,3)
+ testcase_getATR._getATR(self, 3)
def suite():
Modified: trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py
===================================================================
--- trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py 2010-06-09 16:35:51 UTC (rev 482)
+++ trunk/pyscard/src/smartcard/test/scard/testcase_getattrib.py 2010-06-09 16:39:44 UTC (rev 483)
@@ -46,55 +46,55 @@
class testcase_getAttrib(unittest.TestCase):
"""Test scard API for SCardGetAttrib"""
+
def setUp(self):
- hresult, self.hcontext = SCardEstablishContext( SCARD_SCOPE_USER )
+ hresult, self.hcontext = SCardEstablishContext(SCARD_SCOPE_USER)
self.assertEquals(hresult, 0)
- hresult, self.readers = SCardListReaders( self.hcontext, [] )
+ hresult, self.readers = SCardListReaders(self.hcontext, [])
self.assertEquals(hresult, 0)
def tearDown(self):
- hresult = SCardReleaseContext( self.hcontext )
+ hresult = SCardReleaseContext(self.hcontext)
self.assertEquals(hresult, 0)
-
def _getAttrib(self, r):
- if r<len(expectedATRs) and []!=expectedATRs[r]:
+ if r < len(expectedATRs) and [] != expectedATRs[r]:
hresult, hcard, dwActiveProtocol = SCardConnect(
self.hcontext, self.readers[r], SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1)
self.assertEquals(hresult, 0)
try:
- hresult, reader, state, protocol, atr = SCardStatus( hcard )
+ hresult, reader, state, protocol, atr = SCardStatus(hcard)
self.assertEquals(hresult, 0)
- self.assertEquals( reader, expectedReaders[r] )
- self.assertEquals( atr, expectedATRs[r] )
+ self.assertEquals(reader, expectedReaders[r])
+ self.assertEquals(atr, expectedATRs[r])
- if scard.__dict__.has_key( 'SCARD_ATTR_ATR_STRING' ):
- hresult, attrib = SCardGetAttrib( hcard, SCARD_ATTR_ATR_STRING )
+ if scard.__dict__.has_key('SCARD_ATTR_ATR_STRING'):
+ hresult, attrib = SCardGetAttrib(hcard, SCARD_ATTR_ATR_STRING)
self.assertEquals(hresult, 0)
- self.assertEquals( expectedATRs[r], attrib )
+ self.assertEquals(expectedATRs[r], attrib)
- if 'winscard'==resourceManager:
- hresult, attrib = SCardGetAttrib( hcard, SCARD_ATTR_DEVICE_SYSTEM_NAME_A )
+ if 'winscard' == resourceManager:
+ hresult, attrib = SCardGetAttrib(hcard, SCARD_ATTR_DEVICE_SYSTEM_NAME_A)
self.assertEquals(hresult, 0)
- trimmedAttrib=attrib[:-1]
- self.assertEquals( expectedReaders[r], apply( struct.pack, [ '<' + 'B' * len(trimmedAttrib)] + trimmedAttrib ) )
+ trimmedAttrib = attrib[:-1]
+ self.assertEquals(expectedReaders[r], apply(struct.pack, ['<' + 'B' * len(trimmedAttrib)] + trimmedAttrib))
finally:
- hresult = SCardDisconnect( hcard, SCARD_UNPOWER_CARD )
+ hresult = SCardDisconnect(hcard, SCARD_UNPOWER_CARD)
self.assertEquals(hresult, 0)
def test_getATR0(self):
- testcase_getAttrib._getAttrib(self,0)
+ testcase_getAttrib._getAttrib(self, 0)
def test_getATR1(self):
- testcase_getAttrib._getAttrib(self,1)
+ testcase_getAttrib._getAttrib(self, 1)
def test_getATR3(self):
- testcase_getAttrib._getAttrib(self,2)
+ testcase_getAttrib._getAttrib(self, 2)
def test_getATR4(self):
- testcase_getAttrib._getAttrib(self,3)
+ testcase_getAttrib._getAttrib(self, 3)
def suite():
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X