[Zope-CVS] CVS: Products/ZCTextIndex/tests - testLexicon.py:1.1.2.12 testZCTextIndex.py:1.1.2.15

[Guido van Rossum]

Update of /cvs-repository/Products/ZCTextIndex/tests
In directory cvs.zope.org:/tmp/cvs-serv13091/tests

Modified Files:
      Tag: TextIndexDS9-branch
	testLexicon.py testZCTextIndex.py 
Log Message:
Added Makefile.pre.in so that the C extension actually gets built.

Moved Splitter and other reusable pipeline components from ZCTextIndex
to Lexicon.


=== Products/ZCTextIndex/tests/testLexicon.py 1.1.2.11 => 1.1.2.12 ===
 
 from Products.ZCTextIndex.Lexicon import Lexicon
-from Products.ZCTextIndex.ZCTextIndex import Splitter, CaseNormalizer
+from Products.ZCTextIndex.Lexicon import Splitter, CaseNormalizer
 
 class StupidPipelineElement:
     def __init__(self, fromword, toword):


=== Products/ZCTextIndex/tests/testZCTextIndex.py 1.1.2.14 => 1.1.2.15 ===
-     CaseNormalizer, StopWordRemover
+from Products.ZCTextIndex.ZCTextIndex import ZCTextIndex
 from Products.ZCTextIndex.tests \
      import testIndex, testQueryEngine, testQueryParser
 from Products.ZCTextIndex.Index import scaled_int, SCALE_FACTOR
-from Products.ZCTextIndex.Lexicon import Lexicon
+from Products.ZCTextIndex.Lexicon import Lexicon, Splitter
+from Products.ZCTextIndex.Lexicon import CaseNormalizer, StopWordRemover
 
 import unittest