From f23b482d7d50027a40c0609d2674833b3e99c5d1 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sat, 26 Dec 2015 04:55:00 +0100
Subject: [PATCH] adjust test code to get MockElm log joining to PASS

the "log joining" functionality was already implemented
and covered with the generic event log facility, but this test
here was drafted even before that, meaning that the semantics
of matchingn on the log, especially on events, as been
implemented slightly different than planned
---
 tests/gui/abstract-tangible-test.cpp | 20 ++++++++++----------
 tests/gui/test/mock-elm.hpp          |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/gui/abstract-tangible-test.cpp b/tests/gui/abstract-tangible-test.cpp
index 3e90f084e..99441382c 100644
--- a/tests/gui/abstract-tangible-test.cpp
+++ b/tests/gui/abstract-tangible-test.cpp
@@ -179,19 +179,19 @@ namespace test {
           
           bar.joinLog(mock);
           foo.joinLog(mock);
+          CHECK (log.verifyEvent("logJoin","bar")
+                    .beforeEvent("logJoin","foo"));
+          
+          CHECK (mock.verifyEvent("logJoin","bar")
+                     .beforeEvent("logJoin","foo"));
+          CHECK (mock.verifyEvent("create","foo"));
+          CHECK (log.verifyEvent("create","foo"));
+          CHECK (log.verifyEvent("create","dummy")
+                    .beforeEvent("create","bar")
+                    .beforeEvent("create","foo"));
           cout << "____Event-Log________________\n"
                << util::join(mock.getLog(), "\n")
                << "\n───╼━━━━━━━━━╾────────────────"<<endl;
-          CHECK (log.verifyEvent("logJoin").arg("bar")
-                    .beforeEvent("logJoin").arg("foo"));
-          
-          CHECK (mock.verifyEvent("logJoin").arg("bar")
-                     .beforeEvent("logJoin").arg("foo"));
-          CHECK (mock.verify("ctor").arg("foo"));
-          CHECK (log.verify("ctor").arg("foo"));
-          CHECK (log.verify("ctor").arg("dummy")
-                    .before("ctor").arg("bar")
-                    .before("ctor").arg("foo"));
           
           mock.kill();
           foo.markMsg("dummy killed");
diff --git a/tests/gui/test/mock-elm.hpp b/tests/gui/test/mock-elm.hpp
index b502408fe..90fc49a0b 100644
--- a/tests/gui/test/mock-elm.hpp
+++ b/tests/gui/test/mock-elm.hpp
@@ -92,7 +92,7 @@ namespace test{
     {
       using _Par = gui::model::Tangible;
       
-      EventLog log_{this};
+      EventLog log_{this->identify()};
       
       bool virgin_{true};
       bool expanded_{false};