ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

restore defs-registry Unit test

Browse source
This commit is contained in:
Fischlurch 2012-12-22 22:01:51 +01:00
parent a9600387ba
commit bccb7a11b5
4 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/common/query.hpp
View file

@ -327,7 +327,8 @@ namespace lumiera {
return Query<RES>::build(id_.kind).withConditions(def_);
}
operator string() const
string
display() const
{
return "kind=" + lexical_cast<string>(id_.kind)
+",type=" + lexical_cast<string>(id_.type)
@ -431,6 +432,13 @@ namespace lumiera {
return *this;
}
Builder&
fromText (string queryPredicates)
{
this->predicateForm_ = queryPredicates;
return *this;
}
};

2
src/common/query/defs-registry.hpp
View file

@ -132,7 +132,7 @@ namespace query {
return one.queryKey < two.queryKey;
}
operator string () const { return dumpRecord % degree % queryKey % dumpObj(); }
operator string () const { return dumpRecord % degree % queryKey.display() % dumpObj(); }
string dumpObj () const { P<TAR> o (objRef.lock()); return o? string(*o):"dead"; }
};

2
src/proc/mobject/session/query/fake-configrules.hpp
View file

@ -177,7 +177,7 @@ namespace session {
string querySpec ;//(q);////////////////////////////////////////////////////////////////////////////////////////////TODO
if (treat_as_defaults_query (querySpec))
{
Query<TY> defaultsQuery(querySpec);
Query<TY> defaultsQuery = Query<TY>::build().fromText(querySpec);
return solution = Session::current->defaults (defaultsQuery);
} // may cause recursion

23
tests/components/proc/mobject/session/defs-registry-impl-test.cpp
View file

@ -105,7 +105,7 @@ namespace test {
scoped_ptr<DefsRegistry> reg_;
typedef P<Dummy<13> > Obj;
typedef P<Dummy<23> > Prd;
typedef P<Dummy<23> > Pra;
typedef Query<Dummy<13> > Q13;
typedef Query<Dummy<23> > Q23;
@ -117,7 +117,7 @@ namespace test {
// some test objects...
Obj o1, o2, o3;
Q13 q1, q2, q3, q4, q5;
map<Q23, Prd> ps;
map<QueryKey, Pra> ps;
public:
DefsRegistryImpl_test ()
@ -162,13 +162,13 @@ namespace test {
ps.clear();
for (int i=0; i<100; ++i)
{
Prd px (fabricate<23>());
Pra px (fabricate<23>());
Q23 qx (garbage_query());
UNIMPLEMENTED ("generic query key and ordering for map access");////////////////////////////////////////////////////////////////////////////////////////////TODO
// ps[qx] = px;
reg_->put (px, qx);
UNIMPLEMENTED ("Query building from predicate string");////////////////////////////////////////////////////////////////////////////////////////////TODO
// px->instanceID = qx;////////////////////////////////////////////////////////////////////////////////////////////TODO
// store for verification....
px->instanceID = QueryKey(qx).display();
ps[qx] = px;
}
}
@ -214,10 +214,8 @@ namespace test {
{
CHECK ( *j );
Q23 qx ((*j)->instanceID);
UNIMPLEMENTED ("generic query key and ordering for map access");////////////////////////////////////////////////////////////////////////////////////////////TODO
// CHECK ( ps[qx] == (*j));////////////////////////////////////////////////////////////////////////////////////////////TODO
UNIMPLEMENTED ("Query remolding");////////////////////////////////////////////////////////////////////////////////////////////TODO
// d = lib::query::countPred (qx);////////////////////////////////////////////////////////////////////////////////////////////TODO
CHECK ( ps[qx] == (*j));
d = QueryKey(qx).degree();
CHECK ( d_prev <= d );
d_prev = d;
}
@ -225,7 +223,8 @@ namespace test {
// calling with an arbitrary (registered) query
// yields the corresponding object at start of the enumeration
j = reg_->candidates(ps.begin()->first);
Q23 someQuery(ps.begin()->first);
j = reg_->candidates(someQuery);
CHECK ( *j == ps.begin()->second);
}