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

change the EventLog header to store a "this" attribute

Browse source 
seems more logical than calling the attribute "ID",
especially since we're now able to use the on("xyz") matcher
This commit is contained in:
Fischlurch 2015-12-15 23:44:34 +01:00
parent c8068496d1
commit cb4a0a6e60
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/test/event-log.hpp
View file

@ -152,7 +152,7 @@ namespace test{
/** @internal for creating EventLog matchers */
EventMatch(Log const& srcSeq)
: solution_(Iter(srcSeq))
, lastMatch_("HEAD "+ solution_->get("ID"))
, lastMatch_("HEAD "+ solution_->get("this"))
, look_for_match_(true)
, violation_()
{ }
@ -583,7 +583,7 @@ namespace test{
string
getID() const
{
return log_->front().get("ID");
return log_->front().get("this");
}
@ -592,7 +592,7 @@ namespace test{
EventLog (string logID)
: log_(new Log)
{
log({"type=EventLogHeader", "ID="+logID});
log({"type=EventLogHeader", "this="+logID});
}
explicit

4
tests/00support.tests
View file

@ -24,12 +24,12 @@ err-lit: ..after match("β") @ Rec(event|{β})
err: ..after HEAD TestEventLog_test.+
err-lit: __Log_condition_violated__
err-lit: FAILED to match("ham")
err-lit: ..before match("beans") @ Rec(EventLogHeader| ID = baked beans )
err-lit: ..before match("beans") @ Rec(EventLogHeader| this = baked beans )
err-lit: ..before match("spam") @ Rec(event|{spam})
err-lit: ..after HEAD baked beans
err-lit: __Log_condition_violated__
err-lit: FOUND at least match("ham") @ Rec(event|{ham})
err-lit: ..after match("eggs") @ Rec(EventLogHeader| ID = eggs )
err-lit: ..after match("eggs") @ Rec(EventLogHeader| this = eggs )
err-lit: ..before match("spam") @ Rec(event|{spam})
err-lit: ..after match("spam") @ Rec(event|{spam})
err-lit: ..after HEAD eggs

18
tests/library/test/test-event-log-test.cpp
View file

@ -87,7 +87,7 @@ namespace test{
CHECK (log.verify("α").before("β"));
CHECK (not log.verify("β").before("α"));
CHECK (join(log) == "Rec(EventLogHeader| ID = "+idi::instanceTypeID(this)+" ), "
CHECK (join(log) == "Rec(EventLogHeader| this = "+idi::instanceTypeID(this)+" ), "
+ "Rec(event|{α}), "
+ "Rec(event|{β})");
}
@ -164,7 +164,7 @@ namespace test{
CHECK (copy != log2);
CHECK (log1.verify("logJoin|{ham}").after("baked beans"));
CHECK (log1.verify("logJoin|{ham}").after("EventLogHeader| ID = ham").before("eggs").before("bacon").before("logJoin"));
CHECK (log1.verify("logJoin|{ham}").after("EventLogHeader| this = ham").before("eggs").before("bacon").before("logJoin"));
log2.event("sausage");
CHECK (log1.verify("sausage").after("logJoin").after("spam"));
@ -180,16 +180,16 @@ namespace test{
CHECK (join(log1) == string(
"Rec(EventLogHeader| ID = spam ), "
"Rec(EventLogHeader| this = spam ), "
"Rec(event|{baked beans}), "
"Rec(EventLogHeader| ID = ham ), "
"Rec(EventLogHeader| this = ham ), "
"Rec(event|{eggs}), "
"Rec(event|{bacon}), "
"Rec(logJoin|{ham}), "
"Rec(event|{sausage})"));
CHECK (join(copy) == string(
"Rec(EventLogHeader| ID = ham ), "
"Rec(EventLogHeader| this = ham ), "
"Rec(joined|{spam}), "
"Rec(event|{spam tomato})"));
}
@ -206,7 +206,7 @@ namespace test{
CHECK(log.verify("fun1").before("fun2").before("fun3"));
CHECK (join(log) == string(
"Rec(EventLogHeader| ID = funCall ), "
"Rec(EventLogHeader| this = funCall ), "
"Rec(call| fun = fun1, this = "+idi::instanceTypeID(this)+" ), "
"Rec(call| fun = fun2, this = some ), "
"Rec(call| fun = fun3, this = more |{facts, 3.2, 1})"));
@ -263,7 +263,7 @@ namespace test{
CHECK (log.verify("no").arg("fun"));
CHECK (join(log) == string(
"Rec(EventLogHeader| ID = event trace ), "
"Rec(EventLogHeader| this = event trace ), "
"Rec(event| ID = no |{fun}), "
"Rec(call| fun = fun, this = some )"));
}
@ -287,7 +287,7 @@ namespace test{
.before("destiny")
.before("something")
.before("everything"));
CHECK (log.verify("ID").type("EventLogHeader")
CHECK (log.verify("this").type("EventLogHeader")
.before("weird").type("some")
.before("danger").type("warn")
.before("horrible").type("error")
@ -308,7 +308,7 @@ namespace test{
CHECK (log.verifyEvent("destroy","everything"));
CHECK (join(log) == string(
"Rec(EventLogHeader| ID = theHog ), "
"Rec(EventLogHeader| this = theHog ), "
"Rec(some| ID = weird |{stuff}), "
"Rec(warn|{danger}), "
"Rec(error|{horrible}), "