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

[Fred L. Drake, Jr.]

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

Modified Files:
      Tag: NameGeddon-branch
	test_index.py 
Log Message:
- fix up import
- normalize whitespace


=== Zope3/src/zope/app/index/text/tests/test_index.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/index/text/tests/test_index.py:1.1.2.1	Mon Dec 23 14:31:40 2002
+++ Zope3/src/zope/app/index/text/tests/test_index.py	Tue Dec 24 02:41:38 2002
@@ -16,7 +16,7 @@
 $Id$
 """
 
-from unittest import TestCase, TestSuite, main, makeSuite
+import unittest
 
 from zope.component.adapter import provideAdapter
 from zope.app.event.objectevent import ObjectModifiedEvent
@@ -25,7 +25,7 @@
      PlacefulSetup
 
 from zope.app.interfaces.traversing.traverser import ITraverser
-from Zope.App.Traversing import locationAsUnicode
+from zope.app.traversing import locationAsUnicode
 
 from zope.app.interfaces.services.hub import \
      IRegistrationHubEvent, IObjectModifiedHubEvent
@@ -38,6 +38,7 @@
 from zope.app.interfaces.index.text.interfaces import ISearchableText
 from zope.app.index.text.index import TextIndex
 
+
 class FakeSearchableObject:
     __implements__ = ISearchableText
     def __init__(self):
@@ -59,7 +60,7 @@
 Bruce = u"Bruce"
 Sheila = u"Sheila"
 
-class Test(PlacefulSetup, TestCase):
+class Test(PlacefulSetup, unittest.TestCase):
 
     def setUp(self):
         PlacefulSetup.setUp(self)
@@ -99,8 +100,6 @@
         event = ObjectRegisteredHubEvent(None, docid, object=self.object)
         self.index.notify(event)
         self.assertEqual(self.index.documentCount(), 0)
-        
-    
 
     def testHubMachinery(self):
         # Technically this is a functional test
@@ -149,10 +148,8 @@
         self.assertAbsent(Sheila)
 
 
-
-
 def test_suite():
-    return makeSuite(Test)
+    return unittest.makeSuite(Test)
 
 if __name__=='__main__':
-    main(defaultTest='test_suite')
+    unittest.main(defaultTest='test_suite')