[Pyscard-devel] SF.net SVN: pyscard:[511] trunk/pyscard/src/smartcard/test/frameworkpcsc/ testcase_pcscreadergroups.py

[<jda...@us...>]

Revision: 511
          http://pyscard.svn.sourceforge.net/pyscard/?rev=511&view=rev
Author:   jdaussel
Date:     2010-08-18 15:03:25 +0000 (Wed, 18 Aug 2010)

Log Message:
-----------
readers() is now a static method of PCSCReader class

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/test/frameworkpcsc/testcase_pcscreadergroups.py

Modified: trunk/pyscard/src/smartcard/test/frameworkpcsc/testcase_pcscreadergroups.py
===================================================================
--- trunk/pyscard/src/smartcard/test/frameworkpcsc/testcase_pcscreadergroups.py	2010-08-18 13:47:59 UTC (rev 510)
+++ trunk/pyscard/src/smartcard/test/frameworkpcsc/testcase_pcscreadergroups.py	2010-08-18 15:03:25 UTC (rev 511)
@@ -43,7 +43,7 @@
 
 
 from smartcard.pcsc.PCSCReaderGroups import PCSCReaderGroups
-from smartcard.pcsc.PCSCReader import readers
+from smartcard.pcsc.PCSCReader import PCSCReader
 from smartcard.scard import resourceManager
 
 if 'winscard' == resourceManager:
@@ -130,25 +130,25 @@
             groups = PCSCReaderGroups()
             newgroup = 'Pinpad$Readers'
             groups.insert(0, newgroup)
-            for r in readers('SCard$DefaultReaders'):
+            for r in PCSCReader.readers('SCard$DefaultReaders'):
                 r.addtoreadergroup(newgroup)
-            self.assertEquals(readers('SCard$DefaultReaders'), readers(newgroup))
+            self.assertEquals(PCSCReader.readers('SCard$DefaultReaders'), PCSCReader.readers(newgroup))
             groups.pop(0)
-            self.assertEquals([], readers(newgroup))
+            self.assertEquals([], PCSCReader.readers(newgroup))
 
         def testcase_removereaderfromgroup(self):
             """Test for removing readers from group"""
             groups = PCSCReaderGroups()
             newgroup = 'Pinpad$Readers'
             groups.insert(0, newgroup)
-            for r in readers('SCard$DefaultReaders'):
+            for r in PCSCReader.readers('SCard$DefaultReaders'):
                 r.addtoreadergroup(newgroup)
-            self.assertEquals(readers('SCard$DefaultReaders'), readers(newgroup))
-            for r in readers('SCard$DefaultReaders'):
+            self.assertEquals(PCSCReader.readers('SCard$DefaultReaders'), PCSCReader.readers(newgroup))
+            for r in PCSCReader.readers('SCard$DefaultReaders'):
                 r.removefromreadergroup(newgroup)
-            self.assertEquals([], readers(newgroup))
+            self.assertEquals([], PCSCReader.readers(newgroup))
             groups.pop(0)
-            self.assertEquals([], readers(newgroup))
+            self.assertEquals([], PCSCReader.readers(newgroup))
 
     def suite():
         suite1 = unittest.makeSuite(testcase_readergroups)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.