[Zope-Checkins] CVS: Zope/lib/python/Products/PluginIndexes/TextIndexNG/tests - testProximityLexicon.py:1.1.2.4

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/Products/PluginIndexes/TextIndexNG/tests
In directory cvs.zope.org:/tmp/cvs-serv15178/tests

Modified Files:
      Tag: ajung-textindexng-branch
	testProximityLexicon.py 
Log Message:
code cleanup (getting around missing cmp() function for IISets


=== Zope/lib/python/Products/PluginIndexes/TextIndexNG/tests/testProximityLexicon.py 1.1.2.3 => 1.1.2.4 ===
 
 from Products.PluginIndexes.TextIndexNG.ProximityLexicon import ProximityLexicon
-from BTrees.IIBTree import IISet
+from BTrees.IIBTree import IISet, difference
 import Proximity
 
 class Tests(unittest.TestCase):
@@ -56,16 +56,10 @@
 
         for word,wid in self.WIDS.items():
 
-            i1 = IISet()
-            i1.insert(wid)
-            i1 = list(i1)
-            i1.sort()
-            i2 = self._lexicon.get(word)
-            i2 = list(i2)
-            i2.sort()
-
-            self.assertEqual( i1,i2 )
+            set = self._lexicon.get(word)
 
+            diff = difference(IISet([wid]), set)
+            self.assertEqual( len(diff),0, (word,wid))
 
 
     def algorithmTest(self,d):
@@ -75,14 +69,9 @@
             for word in words:
 
                 i1 = self._lexicon.get(key)
-                i1 = list(i1)
-                i1.sort()
-
                 i2 = self._lexicon.get(word)
-                i2 = list(i2)
-                i2.sort()
 
-                self.assertEqual( i1,i2 )
+                self.assertEqual( len(difference(i1,i2)), 0)
 
 
     def testSoundexAscii(self):