diff --git a/src/lib/test/test-helper.cpp b/src/lib/test/test-helper.cpp index 52f0fbbfa..c8599ba0e 100644 --- a/src/lib/test/test-helper.cpp +++ b/src/lib/test/test-helper.cpp @@ -47,7 +47,7 @@ namespace test{ string showSizeof (size_t siz, string name) { - static _Fmt fmt{"sizeof( %s ) %|30t|= %3d"}; + static _Fmt fmt{"sizeof( %s ) %|40t|= %3d"}; return fmt % name % siz; } diff --git a/src/proc/mobject/mobject-ref.hpp b/src/proc/mobject/mobject-ref.hpp index e5eafdf6f..f45d8fe31 100644 --- a/src/proc/mobject/mobject-ref.hpp +++ b/src/proc/mobject/mobject-ref.hpp @@ -288,7 +288,7 @@ namespace mobject { && (*pRef_).template isCompatible(); } - operator string() const ///////////////////////TICKET #527 should be better integrated with the other object types + operator string() const ///////////////////////TICKET #527 #528 should be better integrated with the other object types { return isValid()? string(getPlacement()) : "MRef-NIL"; diff --git a/src/proc/mobject/placement.cpp b/src/proc/mobject/placement.cpp index 6b9cabfa8..4f97a3a1a 100644 --- a/src/proc/mobject/placement.cpp +++ b/src/proc/mobject/placement.cpp @@ -51,7 +51,7 @@ namespace mobject { Placement::operator string () const { - return _Fmt{"Placement<%s> %|50T.| use-cnt=%u ID(%x) adr=%p pointee=%p"} + return _Fmt{"Placement<%s> %|50T.| use-cnt=%u ID(%016x) adr=%p pointee=%p"} % typeStr(this->get()) % use_count() % (size_t)getID() % (void*)this @@ -64,7 +64,7 @@ namespace mobject { format_PlacementID (Placement const& pla) { size_t hashVal = pla.getID(); - return _Fmt{"pID(%x)"} % hashVal; + return _Fmt{"pID(%016x)"} % hashVal; } diff --git a/tests/00support.tests b/tests/00support.tests index 3e817e729..94ade3b17 100644 --- a/tests/00support.tests +++ b/tests/00support.tests @@ -4,13 +4,18 @@ TESTING "Test support and helpers" ./test-suite --group=common TEST "Test support functions" TestHelper_test < ) = 1 +out-lit: sizeof( test::Wrmrmpft ) = 2 +out-lit: sizeof( test::Wrmrmpft ) = 3 +out-lit: sizeof( Universe ) = 42 +out-lit: sizeof( test::Wrmrmpft ) = 1 +out-lit: sizeof( test::Wrmrmpft ) = 1 +out-lit: sizeof( test::Wrmrmpft ) = 1 +out-lit: sizeof( test::Wrmrmpft ) = 1 +out-lit: sizeof( test::Wrmrmpft ) = 1 END diff --git a/tests/12metaprogramming.tests b/tests/12metaprogramming.tests index 2c0db5531..5379872b9 100644 --- a/tests/12metaprogramming.tests +++ b/tests/12metaprogramming.tests @@ -18,7 +18,7 @@ out: doIt out: 13 out: 14 out: doIt -out: sizeof.+lib.+test.+ExampleCustomType123.+ = [248] +out: sizeof. ExampleCustomType123 . = [248] return: 0 END @@ -176,32 +176,38 @@ END TEST "Lumiera Iterator Adapter for STL" IterAdapterSTL_test < +out-lit: iter::eachDistinct +out-lit: iter::eachDistinct::1 +out-lit: iter::eachDistinct::1::2::3::1 +out-lit: iter::eachDistinct::1::2::3::1 +out-lit: -----iterateMapKeyVal---map +out-lit: iter::eachKey::0::1::2::3::4::5::6::7::8::9 +out-lit: iter::eachKey::0::1::2::3::4::5::6::7::8::9 +out-lit: iter::eachVal::0::2::4::6::8::10::12::14::16::18 +out-lit: iter::eachVal::0::2::4::6::8::10::12::14::16::18 +out-lit: iter::eachDistinctKey::0::1::2::3::4::5::6::7::8::9 +out-lit: -----iterateMapKeyVal---unordered_map out: iter::eachKey::.::.::.::.::.::.::.::.::.::. -out: iter::eachVal::.+ +out: iter::eachVal::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+ out: iter::eachDistinctKey::.::.::.::.::.::.::.::.::.::. -out: -----iterateMapKeyVal---.+multimap -out: iter::eachKey::0::0::0::0::0::0::0::0::0::0::1::1::1::1::1::1::1::1::1::2::2::2::2::2::2::2::2::3::3::3::3::3::3::3::4::4::4::4::4::4::5::5::5::5::5::6::6::6::6::7::7::7::8::8::9 -out: iter::eachVal::10::9::8::7::6::5::4::3::2::1::9::8::7::6::5::4::3::2::1::8::7::6::5::4::3::2::1::7::6::5::4::3::2::1::6::5::4::3::2::1::5::4::3::2::1::4::3::2::1::3::2::1::2::1::1 -out: iter::eachDistinctKey::0::1::2::3::4::5::6::7::8::9 -out: -----iterateMapKeyVal---.+unordered_multimap +out-lit: -----iterateMapKeyVal---multimap +out-lit: iter::eachKey::0::0::0::0::0::0::0::0::0::0::1::1::1::1::1::1::1::1::1::2::2::2::2::2::2::2::2::3::3::3::3::3::3::3::4::4::4::4::4::4::5::5::5::5::5::6::6::6::6::7::7::7::8::8::9 +out-lit: iter::eachKey::0::0::0::0::0::0::0::0::0::0::1::1::1::1::1::1::1::1::1::2::2::2::2::2::2::2::2::3::3::3::3::3::3::3::4::4::4::4::4::4::5::5::5::5::5::6::6::6::6::7::7::7::8::8::9 +out-lit: iter::eachVal::10::9::8::7::6::5::4::3::2::1::9::8::7::6::5::4::3::2::1::8::7::6::5::4::3::2::1::7::6::5::4::3::2::1::6::5::4::3::2::1::5::4::3::2::1::4::3::2::1::3::2::1::2::1::1 +out-lit: iter::eachVal::10::9::8::7::6::5::4::3::2::1::9::8::7::6::5::4::3::2::1::8::7::6::5::4::3::2::1::7::6::5::4::3::2::1::6::5::4::3::2::1::5::4::3::2::1::4::3::2::1::3::2::1::2::1::1 +out-lit: iter::eachDistinctKey::0::1::2::3::4::5::6::7::8::9 +out-lit: -----iterateMapKeyVal---unordered_multimap out: iter::eachKey::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::.::. -out: iter::eachVal::.+ +out: iter::eachVal::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+ out: iter::eachDistinctKey::.::.::.::.::.::.::.::.::.::. -out: -----iterateValues4Key---.+multimap -out: iter::eachValForKey::10::9::8::7::6::5::4::3::2::1 -out: -----iterateValues4Key---.+unordered_multimap -out: iter::eachValForKey::.+ -out: snapshot-0-1-2-3-4-5-6-7-8-9 -out: snapshot-22-44 +out-lit: -----iterateValues4Key---multimap +out-lit: iter::eachValForKey::10::9::8::7::6::5::4::3::2::1 +out-lit: -----iterateValues4Key---unordered_multimap +out: iter::eachValForKey::.+::.+::.+::.+::.+::.+::.+::.+::.+::.+ +out-lit: snapshot-0-1-2-3-4-5-6-7-8-9 +out-lit: snapshot-0-1-2-3-4-5-6-7-8-9 +out-lit: snapshot-22-44 END @@ -297,32 +303,32 @@ TEST "Variadic template diagnostics" TestHelperVariadic_test <::Inner const&&) +out: .+lib.meta.test.Space.+Outer.+Inner +out-lit: lib::meta::test::Space const* (*)(lib::meta::test::Outer::Inner const&&) END diff --git a/tests/15library.tests b/tests/15library.tests index 1a889145d..4f9441cea 100644 --- a/tests/15library.tests +++ b/tests/15library.tests @@ -25,59 +25,62 @@ out-lit: can_use_dynamic_downcast = 0 out-lit: can_use_conversion = 1 out-lit: can_use_conversion = 0 out-lit: can_use_dynamic_downcast = 0 +out-lit: can_use_conversion = 0 +out-lit: can_use_dynamic_downcast = 1 out-lit: === standard case: References === -out: Access\(D as D&\) .+D.. adr=0x.+ type: D -out: Access\(D& as D&\) .+D.. adr=0x.+ type: D +out: Access\(D as D&\) .+D.. adr=╲\w{8} ↗«D» +out: Access\(D& as D&\) .+D.. adr=╲\w{8} ↗«D» out-lit: === build a value object === -out: Access.D as D. .+D.. adr=0x.+ type: D -out: Access.D& as D. .+D.. adr=0x.+ type: D -out: Access.D&& as D. .+D.. adr=0x.+ type: D +out: Access.D as D. .+D.. adr=╲\w{8} ↗«D» +out: Access.D& as D. .+D.. adr=╲\w{8} ↗«D» +out: Access.D&& as D. .+D.. adr=╲\w{8} ↗«D» out-lit: === take a pointer === -out: Access.D as D\*. .+0x.+ -out: Access.D& as D\*. .+0x.+ +out: Access.D as D\*. .+╲\w{8} +out: Access.D& as D\*. .+╲\w{8} out-lit: === dereference a pointer === -out: Access.D\* as D&. .+D.. adr=0x.+ type: D -out: Access.D\* as D. .+D.. adr=0x.+ type: D -out: Access.D\*&& as D. .+D.. adr=0x.+ type: D +out: Access.D\* as D&. .+D.. adr=╲\w{8} ↗«D» +out: Access.D\* as D. .+D.. adr=╲\w{8} ↗«D» +out: Access.D\*&& as D. .+D.. adr=╲\w{8} ↗«D» out-lit: === const correctness === -out: Access.D as D const&. .+D.. adr=0x.+ type: D -out: Access.D& as D const&. .+D.. adr=0x.+ type: D -out: Access.D as const D. .+D.. adr=0x.+ type: D -out: Access.D& as const D. .+D.. adr=0x.+ type: D -out: Access.D as const D\*. .+0x.+ -out: Access.D& as const D\*. .+0x.+ -out: Access.D\* as D const&. .+D.. adr=0x.+ type: D -out: Access.D\* as const D. .+D.. adr=0x.+ type: D -out: Access.const D as D const&. .+D.. adr=0x.+ type: D -out: Access.D const& as D const&. .+D.. adr=0x.+ type: D -out: Access.const D as const D. .+D.. adr=0x.+ type: D -out: Access.D const& as const D. .+D.. adr=0x.+ type: D -out: Access.const D as const D\*. .+0x.+ -out: Access.D const& as const D\*. .+0x.+ -out: Access.const D\* as D const&. .+D.. adr=0x.+ type: D -out: Access.const D\* as const D. .+D.. adr=0x.+ type: D -out: Access.D const& as D. .+D.. adr=0x.+ type: D -out: Access.D const&& as D. .+D.. adr=0x.+ type: D +out: Access.D as D const&. .+D.. adr=╲\w{8} ↗«D» +out: Access.D& as D const&. .+D.. adr=╲\w{8} ↗«D» +out: Access.D as const D. .+D.. adr=╲\w{8} ↗«D» +out: Access.D& as const D. .+D.. adr=╲\w{8} ↗«D» +out: Access.D as const D\*. .+╲\w{8} +out: Access.D& as const D\*. .+╲\w{8} +out: Access.D\* as D const&. .+D.. adr=╲\w{8} ↗«D» +out: Access.D\* as const D. .+D.. adr=╲\w{8} ↗«D» +out: Access.const D as D const&. .+D.. adr=╲\w{8} ↗«D» +out: Access.D const& as D const&. .+D.. adr=╲\w{8} ↗«D» +out: Access.const D as const D. .+D.. adr=╲\w{8} ↗«D» +out: Access.D const& as const D. .+D.. adr=╲\w{8} ↗«D» +out: Access.const D as const D\*..+╲\w{8} +out: Access.D const& as const D\*..+╲\w{8} +out: Access.const D\* as D const&..+D.. adr=╲\w{8} ↗«D» +out: Access.const D\* as const D. .+D.. adr=╲\w{8} ↗«D» +out: Access.D const& as D. .+D.. adr=╲\w{8} ↗«D» +out: Access.D const&& as D. .+D.. adr=╲\w{8} ↗«D» out-lit: === work cases: actual conversions === -out: Access.B& as B&. .+B.. adr=0x.+ type: B -out: Access.D& as B&. .+B.. adr=0x.+ type: B -out: Access.B\* as B\*. .+0x.+ -out: Access.D\* as B\*. .+0x.+ -out: Access.D& as B\*. .+0x.+ -out: Access.D\* as B&. .+B.. adr=0x.+ type: B -out: Access.B\*& as B\*&. .+0x.+ -out: Access.D\*& as D\*&. .+0x.+ -out: Access.D& as const B\*. .+0x.+ -out: Access.D\* as B const&. .+B.. adr=0x.+ type: B -out: Access.D const& as const B\*. .+0x.+ -out: Access.const D\* as B const&. .+B.. adr=0x.+ type: B -out: Access.E\(F\)& as F&. .+F.. adr=0x.+ type: F -out: Access.E\(F\)\* as F\*. .+0x.+ -out: Access.E\(F\)\* as F&. .+F.. adr=0x.+ type: F -out: Access.E\(F\)& as F\*. .+0x.+ -out: Access.F\\* as X\*. .+0x.+ -out: Access.X\(F\)\* as X\*. .+0x.+ -out: Access.F\* as B\*. .+0x.+ +out: Access.B& as B&. .+B.. adr=╲\w{8} ↗«B» +out: Access.D& as B&. .+B.. adr=╲\w{8} ↗«B» +out: Access.B\* as B\*. .+╲\w{8} +out: Access.D\* as B\*. .+╲\w{8} +out: Access.D& as B\*. .+╲\w{8} +out: Access.D\* as B&. .+B.. adr=╲\w{8} ↗«B» +out: Access.B\*& as B\*&. .+╲\w{8} +out: Access.D\*& as D\*&. .+╲\w{8} +out: Access.D& as const B\*. .+╲\w{8} +out: Access.D\* as B const&. .+B.. adr=╲\w{8} ↗«B» +out: Access.D const& as const B\*..+╲\w{8} +out: Access.const D\* as B const&..+B.. adr=╲\w{8} ↗«B» +out: Access.E\(F\)& as F&. .+F.. adr=╲\w{8} ↗«F» +out: Access.E\(F\)\* as F\*. .+╲\w{8} +out: Access.E\(F\)\* as F&. .+F.. adr=╲\w{8} ↗«F» +out: Access.E\(F\)& as F\*. .+╲\w{8} +out: Access.F\\* as X\*. .+╲\w{8} +out: Access.X\(F\)\* as X\*. .+╲\w{8} +out: Access.F\* as B&. .+B.. adr=╲\w{8} ↗«B» +out: Access.F\* as E&*. .+E.. adr=╲\w{8} ↗«F» out-lit: Access(int as double) --->2 out-lit: Access(float as long) --->3 END @@ -172,32 +175,33 @@ END TEST "Digxel standard configurations" DigxelConfigurations_test < >--empty-- 0--(val=123)--123| +out-lit: Digxel >--empty--00.000--(val=123.457)--123.457| +out-lit: Digxel--empty--00--(val=42)--42| +out-lit: Digxel--empty--00--(val=-5)---5| +out-lit: Digxel--empty--00--(val=12)--0C| +out-lit: Digxel--empty--00--(val=111)--6F| +out-lit: Digxel--empty--0000--(val=-1234567890)---1234567890| return: 0 END +TEST "plain entry-ID" EntryID_test <-Dummy.0.. +out: ID-strange +out: ID-Dummy.0.. +out: ID-Fork.0.. +out: ID-special +out: sizeof\( idi::EntryID \) .+ = +out: sizeof\( idi::BareEntryID \) .+ = +END + + TEST "formatting/string conversion in output" FormatCOUT_test < -out: ^hey Joe! -out: ^he says: hey Joe! -out: ^the truth: 0 -out: ^just a number: 1.234.*e\+56 -out: ^12345X -out-lit: 0--+--1.1--+--2.2--+--3.3--+--4.4--+--5.5--+--6.6--+--7.7--+--8.8--+--9.9 -out-lit: Nr.01(0.0), Nr.02(2.2), Nr.03(4.4), Nr.04(6.6), Nr.05(8.8), Nr.06(11.0), Nr.07(13.2), Nr.08(15.4), Nr.09(17.6), Nr.10(19.8) return: 0 END @@ -205,12 +209,12 @@ END TEST "formatting by string template" FormatString_test <».+«std::string».eggs.+«std::string».spam.+«std::string».spam -out: GenNode.+"hasSpam".+«bool».1 +out: GenNode.+"baked beans".+Rec...hasSpam = DataCap.«bool».true.+«char».+«string».*«double».+GenNode.+"spam".+«Record».+«string».eggs.+«string».spam.+«string».spam +out: GenNode.+"hasSpam".+«bool».true out: GenNode.+_CHILD_char.+«char».\* -out: GenNode.+_CHILD_string.+«std::string».★ +out: GenNode.+_CHILD_string.+«string».★ out: GenNode.+_CHILD_double.+«double».3.1415927 -out: GenNode.+"spam".+«lib::diff::Record».Rec.ham.+eggs.+spam.+spam -out: GenNode.+_CHILD_string.+«std::string».eggs -out: GenNode.+_CHILD_string.+«std::string».spam -out: GenNode.+_CHILD_TimeSpan.+«lib::time::TimeSpan» +out: GenNode.+"spam".+«Record».Rec.ham.+eggs.+spam.+spam +out: GenNode.+_CHILD_string.+«string».eggs +out: GenNode.+_CHILD_string.+«string».spam +out: GenNode.+_CHILD_TimeSpan.+«TimeSpan»|0:00:00.000≺920ms≻ out: GenNode.+_CHILD_long.+«long.+42 return: 0 END @@ -280,7 +284,7 @@ END TEST "Generic recursive mutation with closure binding" GenericTreeMutator_test < > out-lit: "data" closure received something that would be acceptable out-lit: localData changed to: that would be acceptable return: 0 @@ -339,7 +343,9 @@ out: 1 out: 3 out: 5 out: 7 -out: sizeof\( .+ \) = .*[12468]{1,2} +out: sizeof\( Base . =.+[12468]{1,2} +out: sizeof\( Special . =.+[12468]{1,2} +out: sizeof\( OpaqueHolderBinding[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.n7lumiera6advice4test12_GLOBAL__N_111DummyAdviceE/0(), one/0(), three/1(four), two/0()] +out-lit: Binding[advice.type.dummyAdvice/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()] -out-lit: b2==Binding[advice.type.n3lib4time4TimeE/0(), cat1/0(), cat2/0(), cat3/1(zzz)] +out-lit: b2==Binding[advice.type.time/0(), cat1/0(), cat2/0(), cat3/1(zzz)] return: 0 END @@ -123,21 +123,21 @@ END TEST "Life changing time specifications with feedback" TimeControl_test <-Dummy.001 -out-lit: ID-strange -out-lit: ID-Dummy.002 -out-lit: ID-Fork.001 -out-lit: ID-Fork.002 -out-lit: ID-special -out: sizeof\( ..lib.idi.EntryID.+mobject.+session.+Fork.+ \) = -out: sizeof\( ..lib.idi.+BareEntryID. \) = -return: 0 -END - - PLANNED "ID to type association" TypedID_test < .......... use-cnt=4 +out: sizeof\( MORef \) = (32|24) +out: Placement .................................. use-cnt=4 ID.\w{16} out: Asset\(VIDEO:lumi.test-1 v1\) -out: Placement<.+Clip.> .......... use-cnt=4 +out: Placement .................................. use-cnt=4 ID.\w{16} out: MRef-NIL -out: sizeof\( .+MORef.+session.Clip.+ \) = (32|24) -out: Placement<.+Clip.> .......... use-cnt=4 +out: sizeof\( MORef \) = (32|24) +out: Placement .................................. use-cnt=4 ID.\w{16} out: Asset\(VIDEO:lumi.test-2 v1\) -out: Placement<.+Clip.> .......... use-cnt=4 +out: Placement .................................. use-cnt=4 ID.\w{16} out: MRef-NIL -out: sizeof\( .+MORef.+session.Clip.+ \) = (32|24) -out: Placement<.+Clip.> .......... use-cnt=4 +out: sizeof\( MORef \) = (32|24) +out: Placement .................................. use-cnt=4 ID.\w{16} out: Asset\(VIDEO:lumi.test-1 v1\) -out: Placement<.+Clip.> .......... use-cnt=4 +out: Placement .................................. use-cnt=4 ID.\w{16} out: MRef-NIL -out: sizeof\( .+MORef.+session.Clip.+ \) = (32|24) -out: Placement<.+Clip.> .......... use-cnt=4 +out: sizeof\( MORef \) = (32|24) +out: Placement .................................. use-cnt=4 ID.\w{16} out: Asset\(VIDEO:lumi.test-2 v1\) -out: Placement<.+Clip.> .......... use-cnt=4 +out: Placement .................................. use-cnt=4 ID.\w{16} out: MRef-NIL -out: sizeof\( .+MORef.+session.Clip.+ \) = (32|24) -out: Placement<.+Clip.>.+ use-cnt=4 +out: sizeof\( MORef \) = (32|24) +out: Placement .................................. use-cnt=4 ID.\w{16} out: Asset\(VIDEO:lumi.test-1 v1\) -out: Placement<.+Clip.> .......... use-cnt=4 +out: Placement .................................. use-cnt=4 ID.\w{16} out: MRef-NIL -out: sizeof\( .+MORef.+session.Clip.+ \) = (32|24) -out: Placement<.+Clip.> .......... use-cnt=4 +out: sizeof\( MORef \) = (32|24) +out: Placement .................................. use-cnt=4 ID.\w{16} out: Asset\(VIDEO:lumi.test-1 v1\) -out: Placement<.+Clip.> .......... use-cnt=4 +out: Placement .................................. use-cnt=4 ID.\w{16} out: MRef-NIL -out: sizeof\( .+MORef.+session.Clip.+ \) = (32|24) -out: Placement<.+Clip.> .......... use-cnt=4 +out: sizeof\( MORef \) = (32|24) +out: Placement .................................. use-cnt=4 ID.\w{16} out: Asset\(VIDEO:lumi.test-2 v1\) -out: Placement<.+Clip.> .......... use-cnt=4 -out: Placement<.+Clip.> .......... use-cnt=5 +out: Placement .................................. use-cnt=4 ID.\w{16} +out: Placement .................................. use-cnt=5 ID.\w{16} out: \(VIDEO:lumi.test-1 v1\) + END @@ -91,35 +92,36 @@ END TEST "hierarchical placement types" PlacementHierarchy_test < \) = [0-9]{2} +out: sizeof\( test::TestPlacement \) = [0-9]{2} +out: sizeof\( test::TestPlacement \) = [0-9]{2} +out: sizeof\( test::TestPlacement \) = [0-9]{2} +out: sizeof\( Placement \) = [0-9]{2} +out: Placement ...................... use-cnt=1 ID.\w{16} +out: Placement ...................... use-cnt=1 ID.\w{16} +out: Placement ..................... use-cnt=2 ID.\w{16} +out: Placement .................................. use-cnt=2 ID.\w{16} out: specialAPI() out: pID\(\w{6,16}\) END TEST "PlacementRef_test" PlacementRef_test < ..... use-cnt=2 +out: Placement ..................... use-cnt=2 ID.\w{16} out: specialAPI() END TEST "Placement Index" PlacementIndex_test < ........................ use-cnt=2 +out: ^::Placement ........................ use-cnt=6 +out: ^ ::Placement ........................ use-cnt=6 +out: ^ ::Placement ........................ use-cnt=6 out: ^ ...2 elements at Level 2 -out: ^ ::Placement<.+session.test.TestClip.+ use-cnt=6 +out: ^ ::Placement ........................ use-cnt=6 out: ^ ...3 elements at Level 1 -out: ^::Placement<.+session.test.TestClip.+ use-cnt=2 -out: ^ ::Placement<.+session.test.TestClip.+ use-cnt=1 +out: ^::Placement ........................ use-cnt=2 +out: ^ ::Placement ........................ use-cnt=1 out: ^ ...1 elements at Level 1 out: ^...3 elements at Level 0 END @@ -127,69 +129,69 @@ END TEST "Querying the index" PlacementIndexQuery_test < ...... use-cnt=1 -out: Placement<.+TestSubMO1.> ...... use-cnt=1 -out: Placement<.+DummyMO.> .......... use-cnt=1 -out: Placement<.+TestSubMO21.> ..... use-cnt=1 -out: path to root starting at Placement<.+TestSubMO1 -out: Placement<.+TestSubMO2.> ...... use-cnt=1 -out: Placement<.+session.Label.> ......... use-cnt=1 +out: Placement ...................... use-cnt=1 +out: Placement ...................... use-cnt=1 +out: Placement ......................... use-cnt=1 +out: Placement ..................... use-cnt=1 +out: path to root starting at Placement ...................... use-cnt=1 +out: Placement ...................... use-cnt=1 +out: Placement