[Checkins] SVN: Sandbox/adamg/ocql/trunk/src/ocql/ moving to zcml based config
Adam Groszer
agroszer at gmail.com
Wed Aug 13 14:44:26 EDT 2008
Log message for revision 89812:
moving to zcml based config
Changed:
U Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/aoptimizer_new.txt
A Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/configure.zcml
U Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/tests.py
U Sandbox/adamg/ocql/trunk/src/ocql/compiler/compiler.py
U Sandbox/adamg/ocql/trunk/src/ocql/compiler/compiler.txt
A Sandbox/adamg/ocql/trunk/src/ocql/compiler/configure.zcml
U Sandbox/adamg/ocql/trunk/src/ocql/compiler/optimize_index.txt
U Sandbox/adamg/ocql/trunk/src/ocql/compiler/tests.py
A Sandbox/adamg/ocql/trunk/src/ocql/configure.zcml
A Sandbox/adamg/ocql/trunk/src/ocql/database/configure.zcml
A Sandbox/adamg/ocql/trunk/src/ocql/parser/configure.zcml
A Sandbox/adamg/ocql/trunk/src/ocql/qoptimizer/configure.zcml
A Sandbox/adamg/ocql/trunk/src/ocql/rewriter/configure.zcml
U Sandbox/adamg/ocql/trunk/src/ocql/rewriter/rewriter.py
U Sandbox/adamg/ocql/trunk/src/ocql/rewriter/rewriter.txt
U Sandbox/adamg/ocql/trunk/src/ocql/rewriter/tests.py
U Sandbox/adamg/ocql/trunk/src/ocql/testing/utils.py
U Sandbox/adamg/ocql/trunk/src/ocql/tests/run.txt
U Sandbox/adamg/ocql/trunk/src/ocql/tests/test_metadata.py
U Sandbox/adamg/ocql/trunk/src/ocql/tests/test_old.py
U Sandbox/adamg/ocql/trunk/src/ocql/tests/test_skeleton.py
U Sandbox/adamg/ocql/trunk/src/ocql/tests/test_zope.py
-=-
Modified: Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/aoptimizer_new.txt
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/aoptimizer_new.txt 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/aoptimizer_new.txt 2008-08-13 18:44:25 UTC (rev 89812)
@@ -9,13 +9,7 @@
>>> from ocql.testing.database import TestMetadata
- >>> import ocql.compiler.compiler
- >>> ocql.compiler.compiler.registerAdapters()
- >>> import ocql.rewriter.rewriter
- >>> ocql.rewriter.rewriter.registerAdapters()
-
-
>>> qo = QueryParser("set [ | 1 ]")(TestMetadata())
>>> opt = QueryOptimizer(qo)()
>>> alg = Rewriter(opt)()
Added: Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/configure.zcml
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/configure.zcml (rev 0)
+++ Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/configure.zcml 2008-08-13 18:44:25 UTC (rev 89812)
@@ -0,0 +1,10 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope" >
+
+ <adapter
+ factory=".aoptimizer.AlgebraOptimizer"
+ />
+
+
+
+</configure>
Property changes on: Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/configure.zcml
___________________________________________________________________
Name: svn:keywords
+ Date Author Id Revision
Name: svn:eol-style
+ native
Modified: Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/tests.py
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/tests.py 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/aoptimizer/tests.py 2008-08-13 18:44:25 UTC (rev 89812)
@@ -2,6 +2,8 @@
import doctest
from zope.testing.doctestunit import DocTestSuite,DocFileSuite
+from ocql.testing import utils
+
def test_suite():
flags = doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS
return unittest.TestSuite((
@@ -10,7 +12,8 @@
DocFileSuite('aoptimizer.txt',
optionflags=flags),
DocFileSuite('aoptimizer_new.txt',
- optionflags=flags),
+ optionflags=flags,
+ setUp = utils.setupAdapters),
))
Modified: Sandbox/adamg/ocql/trunk/src/ocql/compiler/compiler.py
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/compiler/compiler.py 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/compiler/compiler.py 2008-08-13 18:44:25 UTC (rev 89812)
@@ -255,21 +255,21 @@
def __call__(self):
return self.ops[self.context.op]
-
-def registerAdapters():
- provideAdapter(EmptyCompiler)
- provideAdapter(SingleCompiler)
- provideAdapter(UnionCompiler)
- provideAdapter(DifferCompiler)
- provideAdapter(IterCompiler)
- provideAdapter(SelectCompiler)
- provideAdapter(ReduceCompiler)
- provideAdapter(RangeCompiler)
- provideAdapter(MakeCompiler)
- provideAdapter(MakeFromIndexCompiler)
- provideAdapter(IfCompiler)
- provideAdapter(LambdaCompiler)
- provideAdapter(ConstantCompiler)
- provideAdapter(IdentifierCompiler)
- provideAdapter(BinaryCompiler)
- provideAdapter(OperatorCompiler)
+#
+#def registerAdapters():
+# provideAdapter(EmptyCompiler)
+# provideAdapter(SingleCompiler)
+# provideAdapter(UnionCompiler)
+# provideAdapter(DifferCompiler)
+# provideAdapter(IterCompiler)
+# provideAdapter(SelectCompiler)
+# provideAdapter(ReduceCompiler)
+# provideAdapter(RangeCompiler)
+# provideAdapter(MakeCompiler)
+# provideAdapter(MakeFromIndexCompiler)
+# provideAdapter(IfCompiler)
+# provideAdapter(LambdaCompiler)
+# provideAdapter(ConstantCompiler)
+# provideAdapter(IdentifierCompiler)
+# provideAdapter(BinaryCompiler)
+# provideAdapter(OperatorCompiler)
Modified: Sandbox/adamg/ocql/trunk/src/ocql/compiler/compiler.txt
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/compiler/compiler.txt 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/compiler/compiler.txt 2008-08-13 18:44:25 UTC (rev 89812)
@@ -11,12 +11,6 @@
>>> from ocql.testing.database import TestMetadata
- >>> import ocql.compiler.compiler
- >>> ocql.compiler.compiler.registerAdapters()
-
- >>> import ocql.rewriter.rewriter
- >>> ocql.rewriter.rewriter.registerAdapters()
-
>>> metadata = TestMetadata()
>>> qo = QueryParser("set [ | 1 ]")(metadata)
>>> opt = QueryOptimizer(qo)()
Added: Sandbox/adamg/ocql/trunk/src/ocql/compiler/configure.zcml
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/compiler/configure.zcml (rev 0)
+++ Sandbox/adamg/ocql/trunk/src/ocql/compiler/configure.zcml 2008-08-13 18:44:25 UTC (rev 89812)
@@ -0,0 +1,59 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope" >
+
+ <adapter
+ factory=".compiler.AlgebraCompiler"
+ />
+
+ <adapter
+ factory=".compiler.EmptyCompiler"
+ />
+ <adapter
+ factory=".compiler.SingleCompiler"
+ />
+ <adapter
+ factory=".compiler.UnionCompiler"
+ />
+ <adapter
+ factory=".compiler.DifferCompiler"
+ />
+ <adapter
+ factory=".compiler.IterCompiler"
+ />
+ <adapter
+ factory=".compiler.SelectCompiler"
+ />
+ <adapter
+ factory=".compiler.ReduceCompiler"
+ />
+ <adapter
+ factory=".compiler.RangeCompiler"
+ />
+ <adapter
+ factory=".compiler.MakeCompiler"
+ />
+ <adapter
+ factory=".compiler.MakeFromIndexCompiler"
+ />
+ <adapter
+ factory=".compiler.IfCompiler"
+ />
+ <adapter
+ factory=".compiler.LambdaCompiler"
+ />
+ <adapter
+ factory=".compiler.ConstantCompiler"
+ />
+ <adapter
+ factory=".compiler.IdentifierCompiler"
+ />
+ <adapter
+ factory=".compiler.BinaryCompiler"
+ />
+ <adapter
+ factory=".compiler.OperatorCompiler"
+ />
+
+
+
+</configure>
Property changes on: Sandbox/adamg/ocql/trunk/src/ocql/compiler/configure.zcml
___________________________________________________________________
Name: svn:keywords
+ Date Author Id Revision
Name: svn:eol-style
+ native
Modified: Sandbox/adamg/ocql/trunk/src/ocql/compiler/optimize_index.txt
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/compiler/optimize_index.txt 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/compiler/optimize_index.txt 2008-08-13 18:44:25 UTC (rev 89812)
@@ -1,30 +1,8 @@
Checking here how a compiled query can be optimized for zope indexes
- >>> from zope.component import provideAdapter
-
- >>> from ocql.parser.queryparser import QueryParser
- >>> from ocql.qoptimizer.qoptimizer import QueryOptimizer
- >>> from ocql.rewriter.rewriter import Rewriter
- >>> from ocql.aoptimizer.aoptimizer import AlgebraOptimizer
- >>> from ocql.compiler.compiler import AlgebraCompiler
- >>> from ocql.database.metadata import Metadata
-
- >>> provideAdapter(QueryParser)
- >>> provideAdapter(QueryOptimizer)
- >>> provideAdapter(Rewriter)
- >>> provideAdapter(AlgebraOptimizer)
- >>> provideAdapter(AlgebraCompiler)
- >>> provideAdapter(Metadata)
-
>>> from ocql.engine import OCQLEngine
- >>> import ocql.compiler.compiler
- >>> ocql.compiler.compiler.registerAdapters()
-
- >>> import ocql.rewriter.rewriter
- >>> ocql.rewriter.rewriter.registerAdapters()
-
>>> from ocql.testing.utils_opt import setupInterfaces
>>> setupInterfaces(None)
>>> from ocql.testing.utils_opt import setupCatalog
Modified: Sandbox/adamg/ocql/trunk/src/ocql/compiler/tests.py
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/compiler/tests.py 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/compiler/tests.py 2008-08-13 18:44:25 UTC (rev 89812)
@@ -2,13 +2,17 @@
import doctest
from zope.testing.doctestunit import DocTestSuite,DocFileSuite
+from ocql.testing import utils
+
def test_suite():
flags = doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS
return unittest.TestSuite((
DocFileSuite('optimize_index.txt',
- optionflags=flags),
+ optionflags=flags,
+ setUp = utils.setupAdapters),
DocFileSuite('compiler.txt',
- optionflags=flags),
+ optionflags=flags,
+ setUp = utils.setupAdapters),
))
Added: Sandbox/adamg/ocql/trunk/src/ocql/configure.zcml
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/configure.zcml (rev 0)
+++ Sandbox/adamg/ocql/trunk/src/ocql/configure.zcml 2008-08-13 18:44:25 UTC (rev 89812)
@@ -0,0 +1,12 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope">
+
+ <include package=".database" />
+
+ <include package=".parser" />
+ <include package=".qoptimizer" />
+ <include package=".rewriter" />
+ <include package=".aoptimizer" />
+ <include package=".compiler" />
+
+</configure>
Property changes on: Sandbox/adamg/ocql/trunk/src/ocql/configure.zcml
___________________________________________________________________
Name: svn:keywords
+ Date Author Id Revision
Name: svn:eol-style
+ native
Added: Sandbox/adamg/ocql/trunk/src/ocql/database/configure.zcml
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/database/configure.zcml (rev 0)
+++ Sandbox/adamg/ocql/trunk/src/ocql/database/configure.zcml 2008-08-13 18:44:25 UTC (rev 89812)
@@ -0,0 +1,10 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope" >
+
+ <adapter
+ factory=".metadata.Metadata"
+ />
+
+
+
+</configure>
Property changes on: Sandbox/adamg/ocql/trunk/src/ocql/database/configure.zcml
___________________________________________________________________
Name: svn:keywords
+ Date Author Id Revision
Name: svn:eol-style
+ native
Added: Sandbox/adamg/ocql/trunk/src/ocql/parser/configure.zcml
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/parser/configure.zcml (rev 0)
+++ Sandbox/adamg/ocql/trunk/src/ocql/parser/configure.zcml 2008-08-13 18:44:25 UTC (rev 89812)
@@ -0,0 +1,10 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope" >
+
+ <adapter
+ factory=".queryparser.QueryParser"
+ />
+
+
+
+</configure>
Property changes on: Sandbox/adamg/ocql/trunk/src/ocql/parser/configure.zcml
___________________________________________________________________
Name: svn:keywords
+ Date Author Id Revision
Name: svn:eol-style
+ native
Added: Sandbox/adamg/ocql/trunk/src/ocql/qoptimizer/configure.zcml
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/qoptimizer/configure.zcml (rev 0)
+++ Sandbox/adamg/ocql/trunk/src/ocql/qoptimizer/configure.zcml 2008-08-13 18:44:25 UTC (rev 89812)
@@ -0,0 +1,10 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope" >
+
+ <adapter
+ factory=".qoptimizer.QueryOptimizer"
+ />
+
+
+
+</configure>
Property changes on: Sandbox/adamg/ocql/trunk/src/ocql/qoptimizer/configure.zcml
___________________________________________________________________
Name: svn:keywords
+ Date Author Id Revision
Name: svn:eol-style
+ native
Added: Sandbox/adamg/ocql/trunk/src/ocql/rewriter/configure.zcml
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/rewriter/configure.zcml (rev 0)
+++ Sandbox/adamg/ocql/trunk/src/ocql/rewriter/configure.zcml 2008-08-13 18:44:25 UTC (rev 89812)
@@ -0,0 +1,85 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope" >
+
+ <adapter
+ factory=".rewriter.Rewriter"
+ />
+
+ <adapter
+ factory=".rewriter.IdentifierRewriter"
+ />
+ <adapter
+ factory=".rewriter.ConstantRewriter"
+ />
+ <adapter
+ factory=".rewriter.QueryRewriter"
+ />
+ <adapter
+ factory=".rewriter.BinaryRewriter"
+ />
+ <adapter
+ factory=".rewriter.UnionRewriter"
+ />
+ <adapter
+ factory=".rewriter.DifferRewriter"
+ />
+ <adapter
+ factory=".rewriter.AndRewriter"
+ />
+ <adapter
+ factory=".rewriter.OrRewriter"
+ />
+ <adapter
+ factory=".rewriter.PropertyRewriter"
+ />
+ <adapter
+ factory=".rewriter.AddRewriter"
+ />
+ <adapter
+ factory=".rewriter.MulRewriter"
+ />
+ <adapter
+ factory=".rewriter.SubRewriter"
+ />
+ <adapter
+ factory=".rewriter.DivRewriter"
+ />
+ <adapter
+ factory=".rewriter.NotRewriter"
+ />
+ <adapter
+ factory=".rewriter.CountRewriter"
+ />
+ <adapter
+ factory=".rewriter.QuentedRewriter"
+ />
+ <adapter
+ factory=".rewriter.EveryRewriter"
+ />
+ <adapter
+ factory=".rewriter.SomeRewriter"
+ />
+ <adapter
+ factory=".rewriter.ConditionRewriter"
+ />
+ <adapter
+ factory=".rewriter.EqRewriter"
+ />
+ <adapter
+ factory=".rewriter.NeRewriter"
+ />
+ <adapter
+ factory=".rewriter.LtRewriter"
+ />
+ <adapter
+ factory=".rewriter.GtRewriter"
+ />
+ <adapter
+ factory=".rewriter.LeRewriter"
+ />
+ <adapter
+ factory=".rewriter.GeRewriter"
+ />
+
+
+</configure>
Property changes on: Sandbox/adamg/ocql/trunk/src/ocql/rewriter/configure.zcml
___________________________________________________________________
Name: svn:keywords
+ Date Author Id Revision
Name: svn:eol-style
+ native
Modified: Sandbox/adamg/ocql/trunk/src/ocql/rewriter/rewriter.py
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/rewriter/rewriter.py 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/rewriter/rewriter.py 2008-08-13 18:44:25 UTC (rev 89812)
@@ -43,7 +43,7 @@
adapts(IIdentifier)
def __call__(self):
- return Identifier(self.context.name)
+ return Identifier(self.context.name)
class ConstantRewriter(ChildRewriter):
implements(IRewriter)
@@ -79,7 +79,7 @@
self.context.collection_type,
self.context.terms[1:],
self.context.target
- ))()
+ ))()
), Make(
self.context.collection_type,
ctype,
@@ -270,7 +270,7 @@
self.context.metadata,
self.context.symbols,
ocql.queryobject.queryobject.Identifier(
- self.context.metadata,
+ self.context.metadata,
self.context.symbols,'i'),
expression
))()
@@ -336,30 +336,30 @@
def get_operator(self):
return Operator('>=')
-
-def registerAdapters():
- provideAdapter(IdentifierRewriter)
- provideAdapter(ConstantRewriter)
- provideAdapter(QueryRewriter)
- provideAdapter(BinaryRewriter)
- provideAdapter(UnionRewriter)
- provideAdapter(DifferRewriter)
- provideAdapter(AndRewriter)
- provideAdapter(OrRewriter)
- provideAdapter(PropertyRewriter)
- provideAdapter(AddRewriter)
- provideAdapter(MulRewriter)
- provideAdapter(SubRewriter)
- provideAdapter(DivRewriter)
- provideAdapter(NotRewriter)
- provideAdapter(CountRewriter)
- provideAdapter(QuentedRewriter)
- provideAdapter(EveryRewriter)
- provideAdapter(SomeRewriter)
- provideAdapter(ConditionRewriter)
- provideAdapter(EqRewriter)
- provideAdapter(NeRewriter)
- provideAdapter(LtRewriter)
- provideAdapter(GtRewriter)
- provideAdapter(LeRewriter)
- provideAdapter(GeRewriter)
+#
+#def registerAdapters():
+# provideAdapter(IdentifierRewriter)
+# provideAdapter(ConstantRewriter)
+# provideAdapter(QueryRewriter)
+# provideAdapter(BinaryRewriter)
+# provideAdapter(UnionRewriter)
+# provideAdapter(DifferRewriter)
+# provideAdapter(AndRewriter)
+# provideAdapter(OrRewriter)
+# provideAdapter(PropertyRewriter)
+# provideAdapter(AddRewriter)
+# provideAdapter(MulRewriter)
+# provideAdapter(SubRewriter)
+# provideAdapter(DivRewriter)
+# provideAdapter(NotRewriter)
+# provideAdapter(CountRewriter)
+# provideAdapter(QuentedRewriter)
+# provideAdapter(EveryRewriter)
+# provideAdapter(SomeRewriter)
+# provideAdapter(ConditionRewriter)
+# provideAdapter(EqRewriter)
+# provideAdapter(NeRewriter)
+# provideAdapter(LtRewriter)
+# provideAdapter(GtRewriter)
+# provideAdapter(LeRewriter)
+# provideAdapter(GeRewriter)
Modified: Sandbox/adamg/ocql/trunk/src/ocql/rewriter/rewriter.txt
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/rewriter/rewriter.txt 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/rewriter/rewriter.txt 2008-08-13 18:44:25 UTC (rev 89812)
@@ -12,10 +12,7 @@
>>> from ocql.testing.database import TestMetadata
- >>> import ocql.rewriter.rewriter
- >>> ocql.rewriter.rewriter.registerAdapters()
-
>>> qo = QueryParser("set [ | 1 ]")(TestMetadata())
>>> opt = QueryOptimizer(qo)()
>>> alg = Rewriter(opt)()
@@ -69,4 +66,3 @@
>>> alg = Rewriter(opt)()
>>> print str(alg)
Iter(<type 'set'>, Lambda c: If(c.credits>`3`, Single(<type 'set'>, c.code), Empty(<type 'set'>)), Make(<type 'set'>, <type 'set'>, ICourse))
-
Modified: Sandbox/adamg/ocql/trunk/src/ocql/rewriter/tests.py
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/rewriter/tests.py 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/rewriter/tests.py 2008-08-13 18:44:25 UTC (rev 89812)
@@ -2,6 +2,8 @@
import doctest
from zope.testing.doctestunit import DocTestSuite,DocFileSuite
+from ocql.testing import utils
+
from ocql.compiler import compiler
def run(expr):
@@ -11,7 +13,7 @@
test.__save_relax = compiler.RELAX_COMPILE
compiler.RELAX_COMPILE = True
- compiler.registerAdapters()
+ utils.setupAdapters(test)
def teardown(test):
compiler.RELAX_COMPILE = test.__save_relax
@@ -20,7 +22,8 @@
flags = doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS
return unittest.TestSuite((
DocFileSuite('rewriter.txt',
- optionflags=flags),
+ optionflags=flags,
+ setUp = utils.setupAdapters),
DocFileSuite('algebra.txt',
optionflags=flags,
globs={'run': run},
Modified: Sandbox/adamg/ocql/trunk/src/ocql/testing/utils.py
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/testing/utils.py 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/testing/utils.py 2008-08-13 18:44:25 UTC (rev 89812)
@@ -7,6 +7,7 @@
from zope import interface, component
from zope.component.interface import provideInterface
+from zope.component import provideAdapter
from zope.app.catalog.catalog import Catalog
from zope.app.catalog.interfaces import ICatalog
@@ -19,6 +20,8 @@
from zope.app.keyreference.testing import SimpleKeyReference
+from zope.configuration import xmlconfig
+
from ocql.testing.sample.interfaces import IOrganization
from ocql.testing.sample.interfaces import IProject
from ocql.testing.sample.interfaces import IStudent
@@ -29,6 +32,8 @@
from ocql.testing.sample.student import Student
from ocql.testing.sample.organization import Organization
+from ocql.testing.database import TestMetadata
+
#import zc.relation.catalog
#import zc.relation.interfaces
#import zc.relation.queryfactory
@@ -37,6 +42,20 @@
#_obj = {}
#_relation = {}
+def setupAdapters(test):
+ context = xmlconfig.string("""
+ <configure
+ xmlns="http://namespaces.zope.org/zope">
+
+ <include package="zope.component" file="meta.zcml" />
+
+ <include package="ocql" />
+
+ </configure>
+ """)
+
+ #provideAdapter(TestMetadata)
+
def setupInterfaces(test):
provideInterface('', IOrganization)
provideInterface('', IProject)
Modified: Sandbox/adamg/ocql/trunk/src/ocql/tests/run.txt
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/tests/run.txt 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/tests/run.txt 2008-08-13 18:44:25 UTC (rev 89812)
@@ -2,30 +2,13 @@
Now we'll see how a query runs
>>> from zope.component import provideAdapter
-
- >>> from ocql.parser.queryparser import QueryParser
- >>> from ocql.qoptimizer.qoptimizer import QueryOptimizer
- >>> from ocql.rewriter.rewriter import Rewriter
- >>> from ocql.aoptimizer.aoptimizer import AlgebraOptimizer
- >>> from ocql.compiler.compiler import AlgebraCompiler
>>> from ocql.testing.database import TestMetadata
-
- >>> provideAdapter(QueryParser)
- >>> provideAdapter(QueryOptimizer)
- >>> provideAdapter(Rewriter)
- >>> provideAdapter(AlgebraOptimizer)
- >>> provideAdapter(AlgebraCompiler)
>>> provideAdapter(TestMetadata)
+
>>> from ocql.engine import OCQLEngine
- >>> import ocql.compiler.compiler
- >>> ocql.compiler.compiler.registerAdapters()
- >>> import ocql.rewriter.rewriter
- >>> ocql.rewriter.rewriter.registerAdapters()
-
-
>>> engine = OCQLEngine()
>>> run = engine.compile("set [ | 1 ]")
>>> run
Modified: Sandbox/adamg/ocql/trunk/src/ocql/tests/test_metadata.py
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/tests/test_metadata.py 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/tests/test_metadata.py 2008-08-13 18:44:25 UTC (rev 89812)
@@ -11,7 +11,6 @@
from ocql.aoptimizer.aoptimizer import AlgebraOptimizer
from ocql.compiler.compiler import AlgebraCompiler
-from ocql.compiler.compiler import registerAdapters
from ocql.database import metadata
from ocql.database.metadata import Metadata
from ocql.engine import OCQLEngine
@@ -20,7 +19,7 @@
from ocql.qoptimizer.qoptimizer import QueryOptimizer
from ocql.queryobject.queryobject import *
from ocql.rewriter.rewriter import Rewriter
-from ocql.testing.utils import setupInterfaces, setupCatalog
+from ocql.testing.utils import setupInterfaces, setupCatalog, setupAdapters
from ocql.tests.test_old import QueryNullParser
from ocql.testing.sample.student import Student
from ocql.exceptions import ReanalyzeRequired
@@ -29,15 +28,7 @@
class testMetadata(unittest.TestCase):
def setUp(self):
- provideAdapter(QueryParser)
- provideAdapter(QueryNullParser)
- provideAdapter(QueryOptimizer)
- provideAdapter(Rewriter)
- provideAdapter(AlgebraOptimizer)
- provideAdapter(AlgebraCompiler)
- provideAdapter(Metadata)
- ocql.compiler.compiler.registerAdapters()
- ocql.rewriter.rewriter.registerAdapters()
+ setupAdapters(self)
setupInterfaces(self)
setupCatalog(self)
Modified: Sandbox/adamg/ocql/trunk/src/ocql/tests/test_old.py
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/tests/test_old.py 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/tests/test_old.py 2008-08-13 18:44:25 UTC (rev 89812)
@@ -25,6 +25,7 @@
from ocql.aoptimizer.aoptimizer import AlgebraOptimizer
from ocql.compiler.compiler import AlgebraCompiler
from ocql.testing.database import TestMetadata
+from ocql.testing.utils import setupInterfaces, setupCatalog, setupAdapters
import ocql.compiler.compiler
import ocql.rewriter.rewriter
@@ -51,15 +52,8 @@
class testOLD(unittest.TestCase):
def setUp(self):
- provideAdapter(QueryParser)
- provideAdapter(QueryNullParser)
- provideAdapter(QueryOptimizer)
- provideAdapter(Rewriter)
- provideAdapter(AlgebraOptimizer)
- provideAdapter(AlgebraCompiler)
+ setupAdapters(self)
provideAdapter(TestMetadata)
- ocql.compiler.compiler.registerAdapters()
- ocql.rewriter.rewriter.registerAdapters()
self.engine = OCQLEngine()
Modified: Sandbox/adamg/ocql/trunk/src/ocql/tests/test_skeleton.py
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/tests/test_skeleton.py 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/tests/test_skeleton.py 2008-08-13 18:44:25 UTC (rev 89812)
@@ -12,6 +12,8 @@
from ocql.engine import OCQLEngine
from ocql.testing.stubs import *
+from ocql.testing import utils
+
class testSkeleton(unittest.TestCase):
def testSomething(self):
registerStubs()
@@ -25,7 +27,9 @@
flags = doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS
return unittest.TestSuite((
unittest.makeSuite(testSkeleton),
- DocFileSuite('run.txt', optionflags=flags),
+ DocFileSuite('run.txt',
+ optionflags=flags,
+ setUp = utils.setupAdapters),
))
if __name__ == '__main__':
Modified: Sandbox/adamg/ocql/trunk/src/ocql/tests/test_zope.py
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/tests/test_zope.py 2008-08-13 18:36:55 UTC (rev 89811)
+++ Sandbox/adamg/ocql/trunk/src/ocql/tests/test_zope.py 2008-08-13 18:44:25 UTC (rev 89812)
@@ -7,7 +7,6 @@
from ocql.aoptimizer.aoptimizer import AlgebraOptimizer
from ocql.compiler.compiler import AlgebraCompiler
-from ocql.compiler.compiler import registerAdapters
from ocql.database import metadata
from ocql.database.metadata import Metadata
from ocql.engine import OCQLEngine
@@ -16,7 +15,7 @@
from ocql.qoptimizer.qoptimizer import QueryOptimizer
from ocql.queryobject.queryobject import *
from ocql.rewriter.rewriter import Rewriter
-from ocql.testing.utils import setupInterfaces, setupCatalog
+from ocql.testing.utils import setupInterfaces, setupCatalog, setupAdapters
from ocql.tests.test_old import QueryNullParser
from ocql.testing.sample.student import Student
import ocql.compiler.compiler
@@ -28,15 +27,7 @@
class testZope(unittest.TestCase):
def setUp(self):
- provideAdapter(QueryParser)
- provideAdapter(QueryNullParser)
- provideAdapter(QueryOptimizer)
- provideAdapter(Rewriter)
- provideAdapter(AlgebraOptimizer)
- provideAdapter(AlgebraCompiler)
- provideAdapter(Metadata)
- ocql.compiler.compiler.registerAdapters()
- ocql.rewriter.rewriter.registerAdapters()
+ setupAdapters(self)
setupInterfaces(self)
setupCatalog(self)
More information about the Checkins
mailing list