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

re-activate some tests

Browse source
This commit is contained in:
Fischlurch 2012-12-26 02:01:26 +01:00
parent 1f6e71272a
commit 873d6c3d5c
5 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/proc/asset/struct-factory-impl.hpp
View file

@ -214,7 +214,6 @@ namespace asset {
TODO ("extract additional properties/capabilities from the query...");
const Asset::Ident idi (createIdent (caps));
string sequenceID = caps.extractID ("sequence");
UNIMPLEMENTED("fabricate a Timeline by query");////////////////////////////////////////////////////////////////////////////////////////////TODO
Query<Sequence> desiredSequence (isnil (sequenceID)? "" : "id("+sequenceID+")");
PSequence sequence = recursive_create_(desiredSequence);
ASSERT (sequence);
@ -232,7 +231,6 @@ namespace asset {
// when we reach this point it is clear a suitable sequence doesn't yet exist in the model
TODO ("actually extract properties/capabilities from the query...");
string trackID = caps.extractID ("track");
UNIMPLEMENTED("fabricate a Sequence by query");////////////////////////////////////////////////////////////////////////////////////////////TODO
Query<Track> desiredTrack (isnil (trackID)? "" : "id("+trackID+")");
// PTrack track = Session::current->query (desiredTrack); ///////////////////////////////////TICKET #639
// TODO: handle the following cases

2
src/proc/mobject/session/sess-manager-impl.cpp
View file

@ -126,7 +126,7 @@ namespace session {
REQUIRE (0 == session_->timelines.size(), "injecting default timeline, but session isn't pristine");
// issue a default query to retrieve or create a Timeline and a default Sequence
asset::PTimeline initialTimeline = session_->defaults (lumiera::Query<asset::Timeline> ());
asset::PTimeline initialTimeline = session_->defaults (lumiera::Query<asset::Timeline> (""));
// these got registered automatically
ENSURE (1 == session_->timelines.size());

4
tests/40components.tests
View file

@ -48,7 +48,7 @@ out-lit: nullary(). --->Binding[nullary/0()]
out-lit: nullary( ) --->Binding[nullary/0()]
out-lit: nullary . --->Binding[nullary/0()]
out-lit: predicate( with-argument ) --->Binding[predicate/1(with-argument)]
out-lit: Binding[advice.type.n3lib6advice4test12_GLOBAL__N_111DummyAdviceE/0(), one/0(), three/1(four), two/0()]
out-lit: Binding[advice.type.n7lumiera6advice4test12_GLOBAL__N_111DummyAdviceE/0(), one/0(), three/1(four), two/0()]
out-lit: b0==Binding[]
out-lit: b1==Binding[cat1/0(), cat2/0()]
out-lit: b2==Binding[cat1/0(), cat2/0()]
@ -530,6 +530,8 @@ END
TEST "Query support utilities" QueryUtils_test <<END
out-lit: ..original : a A AA dufte 1a _1 A_A BÄH White space §&Ω%€GΩ%€ar ☠☠☠ baäääääge!!!!! :
out-lit: normalised : a a aA dufte o1a o_1 a_A bH o white_space gar_bage :
return: 0
END

5
tests/42query.tests
View file

@ -6,11 +6,6 @@ PLANNED "sub-extensible ID" SubID_test <<END
END
TEST "simple query" QueryUtils_test Query <<END
out: N7lumiera5query4test5ThingE: I am writing a test sentence.
END
TEST "normalise ID" QueryUtils_test normaliseID <<END
out-lit: ..original : a A AA dufte 1a _1 A_A BÄH White space §&Ω%€GΩ%€ar ☠☠☠ baäääääge!!!!! :
out-lit: normalised : a a aA dufte o1a o_1 a_A bH o white_space gar_bage :

11
tests/lib/query/query-utils-test.cpp
View file

@ -68,7 +68,6 @@ namespace test{
{
if (isnil(arg)) arg = Cmdline ("Query normaliseID extractID removeTerm countPred");
if (contains (arg, "Query" )) check_Query ();
if (contains (arg, "normaliseID")) check_normaliseID();
if (contains (arg, "extractID" )) check_extractID ();
if (contains (arg, "removeTerm" )) check_removeTerm ();
@ -77,16 +76,6 @@ namespace test{
/** @test Query wrapper class basics */
void
check_Query ()
{
UNIMPLEMENTED ("generate a generic query key");////////////////////////////////////////////////////////////////////////////////////////////TODO
// cout << Query<Thing> ("I am writing a test sentence.").asKey() << endl;////////////////////////////////////////////////////////////////////////////////////////////TODO
}
/** @test sanitising and normalising various tokens */
void
check_normaliseID ()