[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/index/text/tests - test_index.py:1.4

[Guido van Rossum]

Update of /cvs-repository/Zope3/lib/python/Zope/App/index/text/tests
In directory cvs.zope.org:/tmp/cvs-serv9159/tests

Modified Files:
	test_index.py 
Log Message:
Add subscribe and unsubscribe; refactored; added unit test for these.

=== Zope3/lib/python/Zope/App/index/text/tests/test_index.py 1.3 => 1.4 ===
--- Zope3/lib/python/Zope/App/index/text/tests/test_index.py:1.3	Wed Dec  4 09:22:59 2002
+++ Zope3/lib/python/Zope/App/index/text/tests/test_index.py	Wed Dec  4 09:30:47 2002
@@ -56,6 +56,9 @@
             return self.__object
         raise KeyError, (path, canonical_path)
 
+Bruce = u"Bruce"
+Sheila = u"Sheila"
+
 class Test(PlacefulSetup, TestCase):
 
     def setUp(self):
@@ -63,27 +66,32 @@
         self.index = TextIndex()
         self.object = FakeSearchableObject()
 
+    def assertPresent(self, word, docid):
+        results, total = self.index.query(word)
+        self.assertEqual(total, 1)
+        self.assertEqual(results[0][0], docid)
+
+    def assertAbsent(self, word):
+        self.assertEqual(self.index.query(word), ([], 0))
+
     def testNotification(self):
-        event = ObjectRegisteredHubEvent(None, 1000, object=self.object)
+        docid = 1000
+        event = ObjectRegisteredHubEvent(None, docid, object=self.object)
         self.index.notify(event)
-        results, total = self.index.query(u"Bruce")
-        self.assertEqual(total, 1)
-        self.assertEqual(results[0][0], 1000)
+        self.assertPresent(Bruce, docid)
 
-        self.object.texts = [u"Sheila"]
-        event = ObjectModifiedHubEvent(None, 1000, object=self.object)
+        self.object.texts = [Sheila]
+        event = ObjectModifiedHubEvent(None, docid, object=self.object)
         self.index.notify(event)
-        self.assertEqual(self.index.query(u"Bruce"), ([], 0))
-        results, total = self.index.query(u"Sheila")
-        self.assertEqual(total, 1)
-        self.assertEqual(results[0][0], 1000)
+        self.assertPresent(Sheila, docid)
+        self.assertAbsent(Bruce)
 
-        event = ObjectUnregisteredHubEvent(None, 1000,
+        event = ObjectUnregisteredHubEvent(None, docid,
                                            location="fake",
                                            object=self.object)
         self.index.notify(event)
-        self.assertEqual(self.index.query(u"Bruce"), ([], 0))
-        self.assertEqual(self.index.query(u"Sheila"), ([], 0))
+        self.assertAbsent(Bruce)
+        self.assertAbsent(Sheila)
 
     def testHubMachinery(self):
         # Technically this is a functional test
@@ -95,21 +103,17 @@
         provideAdapter(None, ITraverser, lambda dummy: traverser)
 
         hubid = hub.register(location)
-        results, total = self.index.query(u"Bruce")
-        self.assertEqual(total, 1)
-        self.assertEqual(results[0][0], hubid)
+        self.assertPresent(Bruce, hubid)
 
-        self.object.texts = [u"Sheila"]
+        self.object.texts = [Sheila]
         event = ObjectModifiedEvent(self.object, location)
         hub.notify(event)
-        self.assertEqual(self.index.query(u"Bruce"), ([], 0))
-        results, total = self.index.query(u"Sheila")
-        self.assertEqual(total, 1)
-        self.assertEqual(results[0][0], hubid)
+        self.assertPresent(Sheila, hubid)
+        self.assertAbsent(Bruce)
 
         hub.unregister(location)
-        self.assertEqual(self.index.query(u"Bruce"), ([], 0))
-        self.assertEqual(self.index.query(u"Sheila"), ([], 0))
+        self.assertAbsent(Bruce)
+        self.assertAbsent(Sheila)
 
     def testBootstrap(self):
         hub = ObjectHub()
@@ -118,22 +122,17 @@
         provideAdapter(None, ITraverser, lambda dummy: traverser)
         hubid = hub.register(location)
         self.index.subscribe(hub)
-        results, total = self.index.query(u"Bruce")
-        self.assertEqual(total, 1)
-        self.assertEqual(results[0][0], hubid)
+        results, total = self.index.query(Bruce)
+        self.assertPresent(Bruce, hubid)
 
         self.index.unsubscribe(hub)
-        results, total = self.index.query(u"Bruce")
-        self.assertEqual(total, 1)
-        self.assertEqual(results[0][0], hubid)
+        self.assertPresent(Bruce, hubid)
 
-        self.object.texts = [u"Sheila"]
+        self.object.texts = [Sheila]
         event = ObjectModifiedEvent(self.object, location)
         hub.notify(event)
-        results, total = self.index.query(u"Bruce")
-        self.assertEqual(total, 1)
-        self.assertEqual(results[0][0], hubid)
-        self.assertEqual(self.index.query(u"Sheila"), ([], 0))
+        self.assertPresent(Bruce, hubid)
+        self.assertAbsent(Sheila)
 
 def test_suite():
     return makeSuite(Test)