[Zope3-checkins] CVS: Zope3/src/zope/app/index/text/tests - test_batchedrankedprocessor.py:1.3.4.1 test_index.py:1.5.4.1

[Sidnei da Silva]

Update of /cvs-repository/Zope3/src/zope/app/index/text/tests
In directory cvs.zope.org:/tmp/cvs-serv18615/src/zope/app/index/text/tests

Modified Files:
      Tag: paris-copypasterename-branch
	test_batchedrankedprocessor.py test_index.py 
Log Message:
Updating from HEAD to make sure everything still works before merging

=== Zope3/src/zope/app/index/text/tests/test_batchedrankedprocessor.py 1.3 => 1.3.4.1 ===
--- Zope3/src/zope/app/index/text/tests/test_batchedrankedprocessor.py:1.3	Sat Dec 28 12:49:27 2002
+++ Zope3/src/zope/app/index/text/tests/test_batchedrankedprocessor.py	Tue Feb 11 09:41:17 2003
@@ -25,9 +25,8 @@
 from zope.textindex.textindexinterfaces import IQuerying
 from zope.app.interfaces.index.interfaces import \
     IBatchedQuery, ITextIndexQuery, IBatchedResult, IRankedHubIdList
-
-from zope.app.index.text.processors import \
-    BatchedRankedProcessor, IBatchedRankedProcessor
+from zope.app.interfaces.services.query import IQueryProcessor
+from zope.app.index.text.processors import BatchedRankedProcessor
 from zope.app.index.queries import BatchedRankedResult
 from zope.app.index.text.queries import BatchedTextIndexQuery
 
@@ -65,7 +64,7 @@
 
     def test_IVerify(self):
         processor = BatchedRankedProcessor(StupidTextIndex(None))
-        verifyObject(IBatchedRankedProcessor, processor)
+        verifyObject(IQueryProcessor, processor)
 
     def test_parameter(self):
         query = BatchedTextIndexQuery(u"test AND foo OR bar", 0, 20)


=== Zope3/src/zope/app/index/text/tests/test_index.py 1.5 => 1.5.4.1 ===
--- Zope3/src/zope/app/index/text/tests/test_index.py:1.5	Mon Dec 30 09:03:08 2002
+++ Zope3/src/zope/app/index/text/tests/test_index.py	Tue Feb 11 09:41:17 2003
@@ -26,6 +26,7 @@
 from zope.app.interfaces.traversing import ITraverser
 from zope.app.traversing import locationAsUnicode, traverse
 from zope.component import getService
+from zope.component.servicenames import HubIds
 from zope.app.interfaces.services.hub import \
      IRegistrationHubEvent, IObjectModifiedHubEvent
 from zope.app.services.hub import \
@@ -95,7 +96,7 @@
         # Technically this is a functional test
         self.createStandardServices()
         index = traverse(self.rootFolder, '/myIndex')
-        hub = getService(self.rootFolder, 'HubIds')
+        hub = getService(self.rootFolder, HubIds)
         
         hub.subscribe(index, IRegistrationHubEvent)
         hub.subscribe(index, IObjectModifiedHubEvent)
@@ -125,7 +126,7 @@
         self.assertAbsent(Bruce)
         self.assertAbsent(Sheila)
         location = '/bruce'
-        hub = getService(self.rootFolder, 'HubIds')
+        hub = getService(self.rootFolder, HubIds)
         hubid = hub.register(location)
         index.subscribe(hub)
         self.assertEqual(index.isSubscribed(), True)