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

ClipDisplay: also verify invocation of widget relocation via ViewHook

Browse source 
...obviously this is just a dummy implementation and serves only to verify the design
This commit is contained in:
Fischlurch 2019-11-08 21:37:09 +01:00
parent bdf3351f55
commit 37d2e52c1e
2 changed files with 58 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
tests/stage/model/view-hook-test.cpp
View file

@ -34,6 +34,7 @@
//#include <utility>
//#include <memory>
#include <forward_list>
#include <vector>
using util::isSameObject;
@ -41,7 +42,7 @@ using util::contains;
//using util::isnil;
//using std::make_unique;
//using std::move;
//using std::vector;
using std::vector;
using std::forward_list;
@ -61,9 +62,7 @@ namespace test {
friend bool
operator== (DummyWidget const& wa, DummyWidget const& wb)
{
return wa.x == wb.x
and wa.y == wb.y
and wa.i == wb.i;
return wa.i == wb.i; // compare identity
}
};
@ -97,6 +96,14 @@ namespace test {
});
}
auto
findEntry (DummyWidget const& someWidget)
{
return std::find_if (widgets_.begin()
,widgets_.end()
, [&](Attachment const& a) { return a.widget == someWidget; });
}
public:
bool
@ -111,6 +118,16 @@ namespace test {
return util::linearSearch (allWidgets(), someWidget);
}
bool
testVerifyPos (DummyWidget const& someWidget, int x_expected, int y_expected)
{
auto end = widgets_.end();
auto pos = findEntry (someWidget);
return pos != end
and pos->posX == x_expected
and pos->posY == y_expected;
}
/* === Interface ViewHookable === */
@ -124,7 +141,13 @@ namespace test {
void
move (DummyWidget& elm, int xPos, int yPos) override
{
UNIMPLEMENTED ("move it");
auto end = widgets_.end();
auto pos = findEntry (elm);
if (pos != end)
{
pos->posX = xPos;
pos->posY = yPos;
}
}
void
@ -152,6 +175,7 @@ namespace test {
run (Arg)
{
verify_standardUsage();
relocateWidget();
}
@ -173,6 +197,33 @@ namespace test {
}
/** @test relocate a widget on the canvas through the ViewHook handle
*/
void
relocateWidget()
{
FakeCanvas canvas;
DummyWidget w1, w2, w3;
WidgetViewHook h1 = canvas.hook (w1, w1.x,w1.y);
WidgetViewHook h3 = canvas.hook (w3, w3.x,w3.y);
{
WidgetViewHook h2 = canvas.hook (w2, w2.x,w2.y);
CHECK (canvas.testVerifyPos (w2, w2.x,w2.y));
int newX = ++w2.x;
int newY = --w2.y;
h2.moveTo (newX,newY);
CHECK (canvas.testVerifyPos (w2, newX,newY));
CHECK (canvas.testVerifyPos (w1, w1.x,w1.y));
CHECK (canvas.testVerifyPos (w3, w3.x,w3.y));
}
CHECK (canvas.testVerifyPos (w1, w1.x,w1.y));
CHECK (canvas.testVerifyPos (w3, w3.x,w3.y));
CHECK (not canvas.testContains (w2));
}
/** @test */
};

4
wiki/thinkPad.ichthyo.mm
View file

@ -18404,8 +18404,8 @@
<node COLOR="#338800" CREATED="1573242271641" ID="ID_226481127" MODIFIED="1573242355581" TEXT="Basisfall">
<icon BUILTIN="button_ok"/>
</node>
<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1573242278975" ID="ID_1541691410" MODIFIED="1573242369229" TEXT="Verschieben">
<icon BUILTIN="flag-yellow"/>
<node COLOR="#338800" CREATED="1573242278975" ID="ID_1541691410" MODIFIED="1573245310701" TEXT="Verschieben">
<icon BUILTIN="button_ok"/>
</node>
<node BACKGROUND_COLOR="#eee5c3" COLOR="#990000" CREATED="1573242357830" ID="ID_1431447719" MODIFIED="1573242368189" TEXT="relatives Kind-Hook">
<icon BUILTIN="flag-yellow"/>