test fixes up to (not including) the iteration scope bracketing

...since for the latter I'll actually chose quite another
approach, based on the HierarchyOrientationIndicator
This commit is contained in:
Fischlurch 2015-09-17 19:39:34 +02:00
parent 269ef07655
commit 8e8a67e6df
2 changed files with 7 additions and 6 deletions

View file

@ -535,13 +535,13 @@ namespace diff{
explicit
operator bool() const
{
return empty();
return bool(record_);
}
bool
empty() const
{
return bool(record_);
return ! bool(record_);
}
/** target is accessed by cast

View file

@ -237,7 +237,8 @@ namespace test{
CHECK (ref2.idi == ham.idi);
// can stand-in for the original Record...
CHECK (isSameObject (ham, ref2.data.get<Rec>()));
Rec& hamRef = ham.data.get<Rec>();
CHECK (isSameObject (hamRef, ref2.data.get<Rec>()));
VERIFY_ERROR (BOTTOM_VALUE, ref1.data.get<Rec>());
RecRef rr1 = ref1.data.get<RecRef>();
@ -246,8 +247,8 @@ namespace test{
CHECK ( isnil(rr1));
CHECK (!isnil(rr2));
Rec& ham_ref = rr2;
CHECK (isSameObject(ham, ham_ref));
CHECK (isSameObject(&ham, rr2.get()));
CHECK (isSameObject(hamRef, ham_ref));
CHECK (isSameObject(hamRef, *rr2.get()));
// pre-defined special ref-tokens
CHECK ("_END_" == name(Ref::END));
@ -291,7 +292,7 @@ namespace test{
++iter;
CHECK ("hasSpam" == iter->idi.getSym()); // delve into the contents, starting with the attribute(s)
CHECK (true == iter->data.get<bool>());
CHECK ("GenNode-ID(\"hasSpam\")-DataCap|«bool»|true)" == string(*iter));
CHECK ("GenNode-ID(\"hasSpam\")-DataCap|«bool»|1" == string(*iter));
++iter;
CHECK (!iter->isNamed()); // contents of the object's scope