From 034d5f99dcda138c261421b22c29c0994ff55b14 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Fri, 8 Jan 2016 00:16:14 +0100
Subject: [PATCH] fix and adjust various test fixtures

due to the new automatic string conversion in operator<<
the representation of objects has changed occasionally.

I've investigated and verified all those incidents.
---
 src/lib/format-cout.hpp                   |  2 +-
 tests/12metaprogramming.tests             |  6 +++---
 tests/15library.tests                     | 20 ++++++++++----------
 tests/45controller.tests                  | 10 +++++-----
 tests/48proc-operate.tests                |  4 ++--
 tests/library/iter-source-test.cpp        |  4 ++--
 tests/library/meta/access-casted-test.cpp |  6 +++---
 tests/library/removefromsettest.cpp       |  2 +-
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/lib/format-cout.hpp b/src/lib/format-cout.hpp
index e757916bd..1349327b5 100644
--- a/src/lib/format-cout.hpp
+++ b/src/lib/format-cout.hpp
@@ -93,7 +93,7 @@ namespace std {
   operator<< (ostream& os, X const* ptr)
   {
     if (ptr)
-      return util::showAddr(os, ptr) << " ↗" << *ptr;
+      return util::showAddr(os, ptr) << " ↗" << lib::meta::CustomStringConv<X>::invoke (*ptr);
     else
       return os << "⟂ «" << lib::meta::typeStr<X>() << "»";
   }
diff --git a/tests/12metaprogramming.tests b/tests/12metaprogramming.tests
index 1e405b381..295ba9de0 100644
--- a/tests/12metaprogramming.tests
+++ b/tests/12metaprogramming.tests
@@ -229,11 +229,11 @@ END
 TEST "Iterable data source" IterSource_test 13 <<END
 out: ::13::12::11::10::9::8::7::6::5::4::3::2::1
 out: ::.............::............::...........::..........::.........::........::.......::......::.....::....::...::..::.$
-out-lit: ::0:00:03.250::0:00:03.000::0:00:02.750::0:00:02.500::0:00:02.250::0:00:02.000::0:00:01.750::0:00:01.500::0:00:01.250::0:00:01.000::0:00:00.750::0:00:00.500::0:00:00.250
+out-lit: ::3s250ms::3s::2s750ms::2s500ms::2s250ms::2s::1s750ms::1s500ms::1s250ms::1s::750ms::500ms::250ms
 out: (::X...........){13}$
-out: (::0:0.:..\..00){13}$
+out: (::.+s){13}$
 out: (::X...........){13}$
-out: (::0:0.:..\..00){13}$
+out: (::.+s){13}$
 out: distinct_keys::0::1::2::3::4::5::6::7::8::9::10::11::12
 out: values_4_key(::[0-9]{1,2})+
 out: distinct_keys(::[0-9]{1,2}){13}
diff --git a/tests/15library.tests b/tests/15library.tests
index d2d643bba..00bf65de3 100644
--- a/tests/15library.tests
+++ b/tests/15library.tests
@@ -365,16 +365,16 @@ END
 
 
 TEST "RemoveFromSet_test" RemoveFromSet_test <<END
-out-lit: removed  nothing  ---> [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ]
-out-lit: removed 0 ---> [ 1, 2, 3, 4, 5, 6, 7, 8, 9, ]
-out-lit: removed 9 ---> [ 0, 1, 2, 3, 4, 5, 6, 7, 8, ]
-out-lit: removed 5 ---> [ 0, 1, 2, 3, 4, 6, 7, 8, 9, ]
-out-lit: removed 0   2   4   6   8   ---> [ 1, 3, 5, 7, 9, ]
-out-lit: removed   1   3   5   7   9 ---> [ 0, 2, 4, 6, 8, ]
-out-lit: removed 0 1 2 3 4 5 6 7 8 9 ---> [ ]
-out-lit: removed 0 1 2 3 4 5 6 7 8   ---> [ 9, ]
-out-lit: removed   1 2 3 4 5 6 7 8 9 ---> [ 0, ]
-out-lit: removed 0 1 2 3 4   6 7 8 9 ---> [ 5, ]
+out-lit: removed  nothing  ---> [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+out-lit: removed 0 ---> [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+out-lit: removed 9 ---> [ 0, 1, 2, 3, 4, 5, 6, 7, 8 ]
+out-lit: removed 5 ---> [ 0, 1, 2, 3, 4, 6, 7, 8, 9 ]
+out-lit: removed 0   2   4   6   8   ---> [ 1, 3, 5, 7, 9 ]
+out-lit: removed   1   3   5   7   9 ---> [ 0, 2, 4, 6, 8 ]
+out-lit: removed 0 1 2 3 4 5 6 7 8 9 ---> [  ]
+out-lit: removed 0 1 2 3 4 5 6 7 8   ---> [ 9 ]
+out-lit: removed   1 2 3 4 5 6 7 8 9 ---> [ 0 ]
+out-lit: removed 0 1 2 3 4   6 7 8 9 ---> [ 5 ]
 END
 
 
diff --git a/tests/45controller.tests b/tests/45controller.tests
index abeff8e33..2421fe2e1 100644
--- a/tests/45controller.tests
+++ b/tests/45controller.tests
@@ -26,19 +26,19 @@ out: Command-State. arguments=Closure\(.+s.*,Lumiera rocks,..\), <mem: START...L
 out: invoke operation...
 out: START...doIt\( Time=.+s.* "Lumiera rocks" rand=.. \)
 out: undo... memento=START...Lumiera rocks
-out: START...doIt\( Time=.+s.* "Lumiera rocks" rand=.. \)undoIt\(time=0:..:....00\)----memento-:START...Lumiera rocks
+out: START...doIt\( Time=.+s.* "Lumiera rocks" rand=.. \)undoIt\(time=.+s\)----memento-:START...Lumiera rocks
 out: capture state...
-out: modified: Command-State. arguments=Closure\(123ms,unbelievable,..\), <mem: START...doIt\( Time=.+s.* "Lumiera rocks" rand=.. \)undoIt\(time=0:..:....00\)----memento-:START...Lumiera rocksLumiera rocks>.
+out: modified: Command-State. arguments=Closure\(123ms,unbelievable,..\), <mem: START...doIt\( Time=.+s.* "Lumiera rocks" rand=.. \)undoIt\(time=.+s\)----memento-:START...Lumiera rocksLumiera rocks>.
 out: copied  : Command-State. arguments=Closure\(.+s.*,Lumiera rocks,..\), <mem: START...Lumiera rocks>.
-out: undo... memento=START...doIt\( Time=.+s.* "Lumiera rocks" rand=.. \)undoIt\(time=0:..:....00\)----memento-:START...Lumiera rocksLumiera rocks
-out: RESET...undoIt\(time=0:..:....00\)----memento-:START...doIt\( Time=.+s.* "Lumiera rocks" rand=.. \)undoIt\(time=0:..:....00\)----memento-:START...Lumiera rocksLumiera rocks
+out: undo... memento=START...doIt\( Time=.+s.* "Lumiera rocks" rand=.. \)undoIt\(time=.+s\)----memento-:START...Lumiera rocksLumiera rocks
+out: RESET...undoIt\(time=.+s\)----memento-:START...doIt\( Time=.+s.* "Lumiera rocks" rand=.. \)undoIt\(time=.+s\)----memento-:START...Lumiera rocksLumiera rocks
 END
 
 
 TEST "build argument accepting function" ArgumentTupleAccept_test <<END
 out: sizeof\( .+control.+TestClass.+ \) =   1
 out: sizeof\( .+control.+TestClass.+lib.time.TimeVar.+ \) =  (12|16)
-out: 0:..:..\..00
+out: .+s
 return: 0
 END
 
diff --git a/tests/48proc-operate.tests b/tests/48proc-operate.tests
index 84904bac2..ab07012a1 100644
--- a/tests/48proc-operate.tests
+++ b/tests/48proc-operate.tests
@@ -3,9 +3,9 @@ TESTING "Proc Layer combined operations Test Suite" ./test-suite --group=operate
 
 
 TEST "Mock media access" MediaAccessMock_test <<END
-out-lit: accessing "test-1" (dur=0:00:25.000)...
+out-lit: accessing "test-1" (dur=≺25s≻)...
 out-lit:  Channel-0: nameID=video codecID=ID
-out-lit: accessing "test-2" (dur=0:00:25.000)...
+out-lit: accessing "test-2" (dur=≺25s≻)...
 out-lit:  Channel-0: nameID=video codecID=H264
 out-lit:  Channel-1: nameID=audio-L codecID=PCM
 out-lit:  Channel-2: nameID=audio-R codecID=PCM
diff --git a/tests/library/iter-source-test.cpp b/tests/library/iter-source-test.cpp
index fdf6ccc5c..5993b2501 100644
--- a/tests/library/iter-source-test.cpp
+++ b/tests/library/iter-source-test.cpp
@@ -154,10 +154,10 @@ namespace test{
       typedef IterSource<string>::iterator StringIter;
       typedef IterSource<TimeVar>::iterator TimeIter;
       
-      typedef std::map<string,TimeVar>                TreeMap;
+      typedef std::map<string,TimeVar>           TreeMap;
       typedef std::unordered_map<string,TimeVar> HashMap;
       
-      typedef std::multimap<int,int>               TreeMultimap;
+      typedef std::multimap<int,int>          TreeMultimap;
       typedef std::unordered_multimap<int,int>HashMultimap;
       
       
diff --git a/tests/library/meta/access-casted-test.cpp b/tests/library/meta/access-casted-test.cpp
index 47ecde2f3..5e791114d 100644
--- a/tests/library/meta/access-casted-test.cpp
+++ b/tests/library/meta/access-casted-test.cpp
@@ -71,9 +71,9 @@ namespace test {
     
     using lib::test::tyAbbr;
     
-    ostream& operator<< (ostream& s, const B& b) { return s << "B{} adr="<<&b<<" type: "<<tyAbbr(b); }
-    ostream& operator<< (ostream& s, const D& d) { return s << "D{} adr="<<&d<<" type: "<<tyAbbr(d); }
-    ostream& operator<< (ostream& s, const F& f) { return s << "F{} adr="<<&f<<" type: "<<tyAbbr(f); }
+    ostream& operator<< (ostream& s, const B& b) { return s << "B{} adr="<<&b; }
+    ostream& operator<< (ostream& s, const D& d) { return s << "D{} adr="<<&d; }
+    ostream& operator<< (ostream& s, const F& f) { return s << "F{} adr="<<&f; }
     
   }//(End)Test fixture
   
diff --git a/tests/library/removefromsettest.cpp b/tests/library/removefromsettest.cpp
index ec30fc2bc..fe4b14729 100644
--- a/tests/library/removefromsettest.cpp
+++ b/tests/library/removefromsettest.cpp
@@ -51,7 +51,7 @@ namespace test {
   {
     cout << "[ "
          << join (coll)
-         << "]" <<endl;
+         << " ]" <<endl;
   }
   
   function<bool(uint)>