[Checkins] SVN: Sandbox/ocql-foliage/trunk/ fix manualtest2.py for
Charith
Adam Groszer
agroszer at gmail.com
Thu Jun 12 11:23:23 EDT 2008
Log message for revision 87330:
fix manualtest2.py for Charith
Changed:
U Sandbox/ocql-foliage/trunk/buildout.cfg
U Sandbox/ocql-foliage/trunk/doc/schema.py
U Sandbox/ocql-foliage/trunk/src/ocql/tests/manualtest2.py
-=-
Modified: Sandbox/ocql-foliage/trunk/buildout.cfg
===================================================================
--- Sandbox/ocql-foliage/trunk/buildout.cfg 2008-06-12 15:22:07 UTC (rev 87329)
+++ Sandbox/ocql-foliage/trunk/buildout.cfg 2008-06-12 15:23:22 UTC (rev 87330)
@@ -3,10 +3,16 @@
develop = .
-parts = test checker
+parts = test checker manualtest2
[versions]
+[manualtest2]
+recipe = z3c.recipe.dev:script
+eggs = OCQL
+module = ocql.tests.manualtest2
+method = test2
+
[test]
recipe = zc.recipe.testrunner
eggs = OCQL [test]
Modified: Sandbox/ocql-foliage/trunk/doc/schema.py
===================================================================
--- Sandbox/ocql-foliage/trunk/doc/schema.py 2008-06-12 15:22:07 UTC (rev 87329)
+++ Sandbox/ocql-foliage/trunk/doc/schema.py 2008-06-12 15:23:22 UTC (rev 87330)
@@ -35,7 +35,7 @@
vocabulary="vocab_of_ICourse",
)
)
- salary = Int(
+ credits = Int(
title=u"Credits",
)
assessment = List(
Modified: Sandbox/ocql-foliage/trunk/src/ocql/tests/manualtest2.py
===================================================================
--- Sandbox/ocql-foliage/trunk/src/ocql/tests/manualtest2.py 2008-06-12 15:22:07 UTC (rev 87329)
+++ Sandbox/ocql-foliage/trunk/src/ocql/tests/manualtest2.py 2008-06-12 15:23:22 UTC (rev 87330)
@@ -1,8 +1,7 @@
-import testdb
from ocql.engine.queryobject import *
from ocql.engine.queryparser import SymbolContainer
import operator
-import testalgebra
+from ocql.tests import algebra
from ocql.ocqlengine import OCQLEngine
from ocql.engine.runnablequery import RunnableQuery
@@ -11,15 +10,15 @@
def doone(query, qo, expected):
print "==============="
print "query:",query
-
- algebra=qo.rewrite(testalgebra)
-
- print "algebra:",algebra
- code=algebra.compile();
+ algebra_=qo.rewrite(algebra)
+
+ print "algebra:",algebra_
+
+ code=algebra_.compile();
compile(code,'<string>','eval')
- q = RunnableQuery(engine,algebra,code)
-
+ q = RunnableQuery(engine,algebra_,code)
+
print "code:",code
print "---------------"
print "got: ", q.execute()
@@ -29,7 +28,7 @@
def test2():
metadata = engine.metadata
metadata.symbols = SymbolContainer()
-
+
#
# Simple empty query
#
@@ -41,10 +40,10 @@
[] ,
Identifier(metadata,
'') )
-
+
doone(query, qo, set([]))
-
-
+
+
metadata.symbols = SymbolContainer()
#
# Simple SELECT ALL
@@ -61,10 +60,10 @@
Identifier(metadata,'c'),
Identifier(metadata,'ICurses')),
] ,Identifier(metadata,'c') )
-
+
doone(query, qo, set([ "C1" , "C2", "C3" ]))
-
-
+
+
metadata.symbols = SymbolContainer()
#
# Selecting a property
@@ -81,10 +80,10 @@
Identifier(metadata,'c'),
Identifier(metadata,'ICurses')),
] ,Identifier(metadata,'c.code') )
-
+
doone(query, qo, set([ "C1" , "C2", "C3" ]))
-
-
+
+
metadata.symbols = SymbolContainer()
#
# Filtering -- empty result
@@ -105,10 +104,10 @@
Identifier(metadata,'c.credits'),
Constant(metadata,'3')),
] ,Identifier(metadata, 'c.code') )
-
+
doone(query, qo, set([]))
-
-
+
+
metadata.symbols = SymbolContainer()
#
# Filtering -- full result
@@ -127,10 +126,10 @@
Identifier(metadata,'c.credits'),
Constant(metadata,'3')),
] ,Identifier(metadata,'c.code'))
-
+
doone(query, qo, set([ "C1" , "C2", "C3" ]))
-
-
+
+
metadata.symbols = SymbolContainer()
#
# Filtering -- one result
@@ -151,10 +150,10 @@
Identifier(metadata,'c.credits'),
Constant(metadata,'3')),
] ,Identifier(metadata,'c.code'))
-
+
doone(query, qo, set([ "C2", "C3" ]))
-
-
+
+
metadata.symbols = SymbolContainer()
#
# Two filters -- full results
@@ -179,10 +178,10 @@
Identifier(metadata,'c.credits'),
Constant(metadata,'1')),
] ,Identifier(metadata, 'c.code'))
-
+
doone(query, qo, set([ "C1", "C2", "C3" ]))
-
-
+
+
metadata.symbols = SymbolContainer()
#
# Two filters -- one result
@@ -206,10 +205,10 @@
Constant(metadata,'2'),
Identifier(metadata,'c.credits')),
] ,Identifier(metadata,'c.code'))
-
+
doone(query, qo, set([ "C1" ]))
-
-
+
+
metadata.symbols = SymbolContainer()
#
# Two filters -- one result
@@ -233,10 +232,10 @@
Constant(metadata,'2'),
Identifier(metadata,'c.credits')),
] ,Identifier(metadata,'c.code'))
-
+
doone(query, qo, set([ "C1" ]))
-
-
+
+
metadata.symbols = SymbolContainer()
#
# Two filters -- no result
@@ -260,10 +259,10 @@
Identifier(metadata,'c.credits'),
Constant(metadata,'3')),
] ,Identifier(metadata,'c.code'))
-
+
doone(query, qo, set([]))
-
-
+
+
metadata.symbols = SymbolContainer()
#
# join -- Departments running curses
@@ -288,15 +287,15 @@
Identifier(metadata,'d'),
Quanted(metadata,
Some(metadata),
- Property(metadata,
+ Property(metadata,
Identifier(metadata, 'c'),
Identifier(metadata, 'runBy'))
)),
] ,Identifier(metadata,'d.name'))
-
+
doone(query, qo, set(['Computing Science', 'Other Department']))
-
-
+
+
metadata.symbols = SymbolContainer()
#
# join -- Departments running some 3 credits curses
@@ -326,15 +325,15 @@
Quanted(
metadata,
Some(metadata),
- Property(metadata,
+ Property(metadata,
Identifier(metadata, 'c'),
Identifier(metadata, 'runBy'))
)),
] ,Identifier(metadata, 'd.name'))
-
+
doone(query, qo, set(['Computing Science']))
-
-
+
+
metadata.symbols = SymbolContainer()
# join -- Departments running some not 3 credits curses
#
@@ -361,7 +360,7 @@
Quanted(
metadata,
Some(metadata),
- Property(metadata,
+ Property(metadata,
Identifier(metadata, 'c'),
Identifier(metadata, 'runBy'))
)),
@@ -370,10 +369,10 @@
Constant(metadata,'3'),
Identifier(metadata,'c.credits')),
] ,Identifier(metadata,'d.name'))
-
+
doone(query, qo, set(['Other department','Computing Science']))
-
-
+
+
metadata.symbols = SymbolContainer()
#
#
@@ -387,7 +386,7 @@
| d.name ]"""
qo=Query(
metadata,
- set,
+ set,
[
In(
metadata,
@@ -412,7 +411,7 @@
Quanted(
metadata,
Some(metadata),
- Property(metadata,
+ Property(metadata,
Identifier(metadata, 'c'),
Identifier(metadata, 'runBy'))
)),
@@ -420,10 +419,10 @@
)
),Constant(metadata,'2')),
] ,Identifier(metadata,'d.name'))
-
+
doone(query, qo, set(['Other department']))
-
-
+
+
#metadata.symbols = SymbolContainer()
##
##
@@ -444,7 +443,7 @@
# Alias(
# metadata,
# Identifier(metadata,'a'),
- # Property(metadata,
+ # Property(metadata,
# Identifier(metadata, 'c'),
# Identifier(metadata, 'code')))
# ] ,Identifier(metadata,'c') )
More information about the Checkins
mailing list