Menu
▾
▴
[Pyscard-devel] SF.net SVN: pyscard:[471] trunk/pyscard/src/smartcard/test/framework
|
From: <lu...@us...> - 2010-06-09 15:19:52
|
Revision: 471
http://pyscard.svn.sourceforge.net/pyscard/?rev=471&view=rev
Author: ludov
Date: 2010-06-09 15:19:46 +0000 (Wed, 09 Jun 2010)
Log Message:
-----------
make pep8 happy
Modified Paths:
--------------
trunk/pyscard/src/smartcard/test/framework/testcase_Card.py
trunk/pyscard/src/smartcard/test/framework/testcase_CardConnection.py
Modified: trunk/pyscard/src/smartcard/test/framework/testcase_Card.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_Card.py 2010-06-09 15:14:47 UTC (rev 470)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_Card.py 2010-06-09 15:19:46 UTC (rev 471)
@@ -58,16 +58,16 @@
DF_TELECOM = [0x7F, 0x10]
for reader in readers():
- card = Card( reader, expectedATRinReader[str(reader)] )
+ card = Card(reader, expectedATRinReader[str(reader)])
cc = card.createConnection()
- if []!=expectedATRinReader[str(reader)]:
+ if [] != expectedATRinReader[str(reader)]:
cc.connect()
- response, sw1, sw2 = cc.transmit( SELECT + DF_TELECOM )
- expectedSWs={ "9f 1a":1, "9f 20":2, "6e 0":3 }
- self.assertEquals( [], response )
- self.assert_( expectedSWs.has_key( "%x %x" % (sw1, sw2 ) ) or "9f"== "%x" % sw1 )
+ response, sw1, sw2 = cc.transmit(SELECT + DF_TELECOM)
+ expectedSWs = {"9f 1a": 1, "9f 20": 2, "6e 0": 3}
+ self.assertEquals([], response)
+ self.assert_(expectedSWs.has_key("%x %x" % (sw1, sw2)) or "9f" == "%x" % sw1)
else:
- self.assertRaises( NoCardException, cc.connect )
+ self.assertRaises(NoCardException, cc.connect)
def testcase_Card_FromReaderStrings(self):
"""Create a Card from reader strings and test that the response
@@ -76,33 +76,34 @@
DF_TELECOM = [0x7F, 0x10]
for reader in readers():
- card = Card( str(reader), expectedATRinReader[str(reader)] )
+ card = Card(str(reader), expectedATRinReader[str(reader)])
cc = card.createConnection()
- if []!=expectedATRinReader[str(reader)]:
+ if [] != expectedATRinReader[str(reader)]:
cc.connect()
- response, sw1, sw2 = cc.transmit( SELECT + DF_TELECOM )
- expectedSWs={ "9f 1a":1, "9f 20":2, "6e 0":3 }
- self.assertEquals( [], response )
- self.assert_( expectedSWs.has_key( "%x %x" % (sw1, sw2 ) ) or "9f"== "%x" % sw1 )
+ response, sw1, sw2 = cc.transmit(SELECT + DF_TELECOM)
+ expectedSWs = {"9f 1a": 1, "9f 20": 2, "6e 0": 3}
+ self.assertEquals([], response)
+ self.assert_(expectedSWs.has_key("%x %x" % (sw1, sw2)) or "9f" == "%x" % sw1)
else:
- self.assertRaises( NoCardException, cc.connect )
+ self.assertRaises(NoCardException, cc.connect)
def testcase_Card_Eq_NotEq(self):
"""Test == and != for Cards."""
for reader in readers():
- card = Card( str(reader), expectedATRinReader[str(reader)] )
- cardcopy = Card( str(reader), expectedATRinReader[str(reader)] )
- self.assertEquals( True, card==cardcopy )
- self.assertEquals( True, not card!=cardcopy )
+ card = Card(str(reader), expectedATRinReader[str(reader)])
+ cardcopy = Card(str(reader), expectedATRinReader[str(reader)])
+ self.assertEquals(True, card == cardcopy)
+ self.assertEquals(True, not card != cardcopy)
for reader in readers():
- card = Card( str(reader), expectedATRinReader[str(reader)] )
- cardcopy = Card( str(reader), [0,0] )
- self.assertEquals( True, card!=cardcopy )
- self.assertEquals( True, not card==cardcopy )
+ card = Card(str(reader), expectedATRinReader[str(reader)])
+ cardcopy = Card(str(reader), [0, 0])
+ self.assertEquals(True, card != cardcopy)
+ self.assertEquals(True, not card == cardcopy)
+
def suite():
- suite1 = unittest.makeSuite( testcase_CardConnection )
+ suite1 = unittest.makeSuite(testcase_CardConnection)
return unittest.TestSuite((suite1))
Modified: trunk/pyscard/src/smartcard/test/framework/testcase_CardConnection.py
===================================================================
--- trunk/pyscard/src/smartcard/test/framework/testcase_CardConnection.py 2010-06-09 15:14:47 UTC (rev 470)
+++ trunk/pyscard/src/smartcard/test/framework/testcase_CardConnection.py 2010-06-09 15:19:46 UTC (rev 471)
@@ -59,14 +59,14 @@
for reader in readers():
cc = reader.createConnection()
- if []!=expectedATRinReader[str(reader)]:
+ if [] != expectedATRinReader[str(reader)]:
cc.connect()
- response, sw1, sw2 = cc.transmit( SELECT + DF_TELECOM )
- expectedSWs={ "9f 1a":1, "6e 0":2, "9f 20":3, "9f 22":4 }
- self.assertEquals( [], response )
- self.assert_( expectedSWs.has_key( "%x %x" % (sw1, sw2 ) ) or "9f"== "%x" % sw1 )
+ response, sw1, sw2 = cc.transmit(SELECT + DF_TELECOM)
+ expectedSWs = {"9f 1a": 1, "6e 0": 2, "9f 20": 3, "9f 22": 4}
+ self.assertEquals([], response)
+ self.assert_(expectedSWs.has_key("%x %x" % (sw1, sw2)) or "9f" == "%x" % sw1)
else:
- self.assertRaises( NoCardException, cc.connect )
+ self.assertRaises(NoCardException, cc.connect)
cc.disconnect()
def testcase_CardConnectionT0(self):
@@ -76,14 +76,14 @@
for reader in readers():
cc = reader.createConnection()
- if []!=expectedATRinReader[str(reader)]:
- cc.connect( CardConnection.T0_protocol )
- response, sw1, sw2 = cc.transmit( SELECT + DF_TELECOM )
- expectedSWs={ "9f 1a":1, "6e 0":2, "9f 20":3, "9f 22":4 }
- self.assertEquals( [], response )
- self.assert_( expectedSWs.has_key( "%x %x" % (sw1, sw2 ) ) or "9f"== "%x" % sw1 )
+ if [] != expectedATRinReader[str(reader)]:
+ cc.connect(CardConnection.T0_protocol)
+ response, sw1, sw2 = cc.transmit(SELECT + DF_TELECOM)
+ expectedSWs = {"9f 1a": 1, "6e 0": 2, "9f 20": 3, "9f 22": 4}
+ self.assertEquals([], response)
+ self.assert_(expectedSWs.has_key("%x %x" % (sw1, sw2)) or "9f" == "%x" % sw1)
else:
- self.assertRaises( NoCardException, cc.connect )
+ self.assertRaises(NoCardException, cc.connect)
cc.disconnect()
def testcase_CardConnectionT1inConnect(self):
@@ -92,15 +92,14 @@
for reader in readers():
cc = reader.createConnection()
# on Mac OS X Tiger, trying to connect with T=1 protocol does not except
- if not 'pcsclite-tiger'==resourceManagerSubType:
- if []!=expectedATRinReader[str(reader)]:
+ if not 'pcsclite-tiger' == resourceManagerSubType:
+ if [] != expectedATRinReader[str(reader)]:
# should fail since the test card does not support T1
- self.assertRaises( CardConnectionException, cc.connect, CardConnection.T1_protocol )
+ self.assertRaises(CardConnectionException, cc.connect, CardConnection.T1_protocol)
else:
- self.assertRaises( NoCardException, cc.connect )
+ self.assertRaises(NoCardException, cc.connect)
cc.disconnect()
-
def testcase_CardConnectionT1inTransmit(self):
"""Test that T1 in transmit for a T0 card fails."""
SELECT = [0xA0, 0xA4, 0x00, 0x00, 0x02]
@@ -108,11 +107,11 @@
for reader in readers():
cc = reader.createConnection()
- if []!=expectedATRinReader[str(reader)]:
+ if [] != expectedATRinReader[str(reader)]:
cc.connect()
- self.assertRaises( CardConnectionException, cc.transmit, SELECT + DF_TELECOM, CardConnection.T1_protocol )
+ self.assertRaises(CardConnectionException, cc.transmit, SELECT + DF_TELECOM, CardConnection.T1_protocol)
else:
- self.assertRaises( NoCardException, cc.connect )
+ self.assertRaises(NoCardException, cc.connect)
cc.disconnect()
def testcase_CardConnectionT0T1(self):
@@ -122,17 +121,16 @@
for reader in readers():
cc = reader.createConnection()
- if []!=expectedATRinReader[str(reader)]:
- cc.connect( CardConnection.T0_protocol | CardConnection.T1_protocol )
- response, sw1, sw2 = cc.transmit( SELECT + DF_TELECOM )
- expectedSWs={ "9f 1a":1, "6e 0":2, "9f 20":3, "9f 22":4 }
- self.assertEquals( [], response )
- self.assert_( expectedSWs.has_key( "%x %x" % (sw1, sw2 ) ) or "9f"== "%x" % sw1 )
+ if [] != expectedATRinReader[str(reader)]:
+ cc.connect(CardConnection.T0_protocol | CardConnection.T1_protocol)
+ response, sw1, sw2 = cc.transmit(SELECT + DF_TELECOM)
+ expectedSWs = {"9f 1a": 1, "6e 0": 2, "9f 20": 3, "9f 22": 4}
+ self.assertEquals([], response)
+ self.assert_(expectedSWs.has_key("%x %x" % (sw1, sw2)) or "9f" == "%x" % sw1)
else:
- self.assertRaises( NoCardException, cc.connect )
+ self.assertRaises(NoCardException, cc.connect)
cc.disconnect()
-
def testcase_CardConnectionT0inTransmit(self):
"""Test with T0 in transmit the response to SELECT DF_TELECOM."""
SELECT = [0xA0, 0xA4, 0x00, 0x00, 0x02]
@@ -140,34 +138,34 @@
for reader in readers():
cc = reader.createConnection()
- if []!=expectedATRinReader[str(reader)]:
- cc.connect( CardConnection.T0_protocol )
- response, sw1, sw2 = cc.transmit( SELECT + DF_TELECOM, CardConnection.T0_protocol )
- expectedSWs={ "9f 1a":1, "6e 0":2, "9f 20":3, "9f 22":4 }
- self.assertEquals( [], response )
- self.assert_( expectedSWs.has_key( "%x %x" % (sw1, sw2 ) ) or "9f"== "%x" % sw1 )
+ if [] != expectedATRinReader[str(reader)]:
+ cc.connect(CardConnection.T0_protocol)
+ response, sw1, sw2 = cc.transmit(SELECT + DF_TELECOM, CardConnection.T0_protocol)
+ expectedSWs = {"9f 1a": 1, "6e 0": 2, "9f 20": 3, "9f 22": 4}
+ self.assertEquals([], response)
+ self.assert_(expectedSWs.has_key("%x %x" % (sw1, sw2)) or "9f" == "%x" % sw1)
else:
- self.assertRaises( NoCardException, cc.connect )
+ self.assertRaises(NoCardException, cc.connect)
cc.disconnect()
-
def testcase_CardConnectionT0T1inTransmitMustFail(self):
- """Test with bad parameter in transmit the response to SELECT DF_TELECOM."""
+ """Test with bad parameter in transmit the response to SELECT
+ DF_TELECOM."""
SELECT = [0xA0, 0xA4, 0x00, 0x00, 0x02]
DF_TELECOM = [0x7F, 0x10]
for reader in readers():
cc = reader.createConnection()
- if []!=expectedATRinReader[str(reader)]:
- cc.connect( CardConnection.T0_protocol | CardConnection.T1_protocol )
- self.assertRaises( CardConnectionException, cc.transmit, SELECT + DF_TELECOM, CardConnection.T0_protocol | CardConnection.T1_protocol )
+ if [] != expectedATRinReader[str(reader)]:
+ cc.connect(CardConnection.T0_protocol | CardConnection.T1_protocol)
+ self.assertRaises(CardConnectionException, cc.transmit, SELECT + DF_TELECOM, CardConnection.T0_protocol | CardConnection.T1_protocol)
else:
- self.assertRaises( NoCardException, cc.connect )
+ self.assertRaises(NoCardException, cc.connect)
cc.disconnect()
def suite():
- suite1 = unittest.makeSuite( testcase_CardConnection )
+ suite1 = unittest.makeSuite(testcase_CardConnection)
return unittest.TestSuite((suite1))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
