Updated tests for different behavior of mouse events

0.8
Bruno Van de Velde 2017-07-05 15:12:24 +02:00
parent 85e5d99267
commit c5bf34bf9b
5 changed files with 47 additions and 47 deletions

View File

@ -31,19 +31,19 @@ void testWidgetSignals(tgui::Widget::Ptr widget)
widget->setPosition({40, 30});
widget->setSize({150, 100});
parent->mouseMoved({10, 15});
parent->mouseMoved({40, 40});
REQUIRE(mouseEnteredCount == 0);
REQUIRE(mouseLeftCount == 0);
parent->mouseMoved({40, 30});
parent->mouseMoved({70, 55});
REQUIRE(mouseEnteredCount == 1);
REQUIRE(mouseLeftCount == 0);
parent->mouseMoved({189, 129});
parent->mouseMoved({219, 154});
REQUIRE(mouseEnteredCount == 1);
REQUIRE(mouseLeftCount == 0);
parent->mouseMoved({190, 130});
parent->mouseMoved({220, 155});
REQUIRE(mouseEnteredCount == 1);
REQUIRE(mouseLeftCount == 1);
}
@ -66,11 +66,11 @@ void testClickableWidgetSignals(tgui::ClickableWidget::Ptr widget)
SECTION("mouseOnWidget")
{
REQUIRE(!widget->mouseOnWidget({-1, -1}));
REQUIRE(widget->mouseOnWidget({0, 0}));
REQUIRE(widget->mouseOnWidget({75, 50}));
REQUIRE(widget->mouseOnWidget({149, 99}));
REQUIRE(!widget->mouseOnWidget({150, 100}));
REQUIRE(!widget->mouseOnWidget({39, 29}));
REQUIRE(widget->mouseOnWidget({40, 30}));
REQUIRE(widget->mouseOnWidget({115, 80}));
REQUIRE(widget->mouseOnWidget({189, 129}));
REQUIRE(!widget->mouseOnWidget({190, 130}));
REQUIRE(mousePressedCount == 0);
REQUIRE(mouseReleasedCount == 0);
@ -83,21 +83,21 @@ void testClickableWidgetSignals(tgui::ClickableWidget::Ptr widget)
parent->setPosition({60, 55});
parent->add(widget);
parent->leftMouseReleased({115, 80});
parent->leftMouseReleased({175, 135});
REQUIRE(mouseReleasedCount == 1);
REQUIRE(clickedCount == 0);
SECTION("mouse press")
{
parent->leftMousePressed({115, 80});
parent->leftMousePressed({175, 135});
REQUIRE(mousePressedCount == 1);
REQUIRE(mouseReleasedCount == 1);
REQUIRE(clickedCount == 0);
}
parent->leftMouseReleased({115, 80});
parent->leftMouseReleased({175, 135});
REQUIRE(mousePressedCount == 1);
REQUIRE(mouseReleasedCount == 2);

View File

@ -174,11 +174,11 @@ TEST_CASE("[ChildWindow]")
SECTION("mouseOnWidget")
{
REQUIRE(!childWindow->mouseOnWidget({-1, -1}));
REQUIRE(childWindow->mouseOnWidget({0, 0}));
REQUIRE(childWindow->mouseOnWidget({75, 50}));
REQUIRE(childWindow->mouseOnWidget({153, 123}));
REQUIRE(!childWindow->mouseOnWidget({154, 124}));
REQUIRE(!childWindow->mouseOnWidget({39, 29}));
REQUIRE(childWindow->mouseOnWidget({40, 30}));
REQUIRE(childWindow->mouseOnWidget({115, 80}));
REQUIRE(childWindow->mouseOnWidget({193, 153}));
REQUIRE(!childWindow->mouseOnWidget({194, 154}));
}
SECTION("mouse move")
@ -193,19 +193,19 @@ TEST_CASE("[ChildWindow]")
parent->setPosition({30, 25});
parent->add(childWindow);
parent->mouseMoved({10, 15});
parent->mouseMoved({40, 40});
REQUIRE(mouseEnteredCount == 0);
REQUIRE(mouseLeftCount == 0);
parent->mouseMoved({40, 30});
parent->mouseMoved({70, 55});
REQUIRE(mouseEnteredCount == 1);
REQUIRE(mouseLeftCount == 0);
parent->mouseMoved({193, 153});
parent->mouseMoved({223, 178});
REQUIRE(mouseEnteredCount == 1);
REQUIRE(mouseLeftCount == 0);
parent->mouseMoved({194, 154});
parent->mouseMoved({224, 179});
REQUIRE(mouseEnteredCount == 1);
REQUIRE(mouseLeftCount == 1);
}

View File

@ -104,11 +104,11 @@ TEST_CASE("[Panel]")
SECTION("mouseOnWidget")
{
REQUIRE(!panel->mouseOnWidget({-1, -1}));
REQUIRE(panel->mouseOnWidget({0, 0}));
REQUIRE(panel->mouseOnWidget({75, 50}));
REQUIRE(panel->mouseOnWidget({149, 99}));
REQUIRE(!panel->mouseOnWidget({150, 100}));
REQUIRE(!panel->mouseOnWidget({39, 29}));
REQUIRE(panel->mouseOnWidget({40, 30}));
REQUIRE(panel->mouseOnWidget({115, 80}));
REQUIRE(panel->mouseOnWidget({189, 129}));
REQUIRE(!panel->mouseOnWidget({190, 130}));
REQUIRE(mousePressedCount == 0);
REQUIRE(mouseReleasedCount == 0);
@ -127,19 +127,19 @@ TEST_CASE("[Panel]")
parent->setPosition({30, 25});
parent->add(panel);
parent->mouseMoved({10, 15});
parent->mouseMoved({40, 40});
REQUIRE(mouseEnteredCount == 0);
REQUIRE(mouseLeftCount == 0);
parent->mouseMoved({40, 30});
parent->mouseMoved({70, 55});
REQUIRE(mouseEnteredCount == 1);
REQUIRE(mouseLeftCount == 0);
parent->mouseMoved({189, 129});
parent->mouseMoved({219, 154});
REQUIRE(mouseEnteredCount == 1);
REQUIRE(mouseLeftCount == 0);
parent->mouseMoved({190, 130});
parent->mouseMoved({220, 155});
REQUIRE(mouseEnteredCount == 1);
REQUIRE(mouseLeftCount == 1);
}
@ -151,21 +151,21 @@ TEST_CASE("[Panel]")
parent->setPosition(60, 55);
parent->add(panel);
parent->leftMouseReleased({115, 80});
parent->leftMouseReleased({175, 135});
REQUIRE(mouseReleasedCount == 1);
REQUIRE(clickedCount == 0);
SECTION("mouse press")
{
parent->leftMousePressed({115, 80});
parent->leftMousePressed({175, 135});
REQUIRE(mousePressedCount == 1);
REQUIRE(mouseReleasedCount == 1);
REQUIRE(clickedCount == 0);
}
parent->leftMouseReleased({115, 80});
parent->leftMouseReleased({175, 135});
REQUIRE(mousePressedCount == 1);
REQUIRE(mouseReleasedCount == 2);

View File

@ -128,22 +128,22 @@ TEST_CASE("[RadioButton]")
radioButton->setTextClickable(false);
REQUIRE(!radioButton->isTextClickable());
REQUIRE(!radioButton->mouseOnWidget({70, 30}));
REQUIRE(!radioButton->mouseOnWidget({110, 60}));
radioButton->setTextClickable(true);
REQUIRE(radioButton->isTextClickable());
REQUIRE(radioButton->mouseOnWidget({70, 30}));
REQUIRE(radioButton->mouseOnWidget({110, 60}));
}
SECTION("Without text")
{
radioButton->setTextClickable(false);
REQUIRE(!radioButton->isTextClickable());
REQUIRE(!radioButton->mouseOnWidget({70, 30}));
REQUIRE(!radioButton->mouseOnWidget({110, 60}));
radioButton->setTextClickable(true);
REQUIRE(radioButton->isTextClickable());
REQUIRE(!radioButton->mouseOnWidget({70, 30}));
REQUIRE(!radioButton->mouseOnWidget({110, 60}));
}
}
@ -164,17 +164,17 @@ TEST_CASE("[RadioButton]")
radioButton->connect("Checked", genericCallback, std::ref(checkCount));
radioButton->connect("Unchecked", genericCallback, std::ref(uncheckCount));
radioButton->leftMousePressed({65, 60});
radioButton->leftMousePressed({105, 90});
REQUIRE(checkCount == 0);
REQUIRE(uncheckCount == 0);
radioButton->leftMouseReleased({65, 60});
radioButton->leftMouseReleased({105, 90});
REQUIRE(checkCount == 1);
REQUIRE(uncheckCount == 0);
// Radio buttons can't be unchecked by user interaction
radioButton->leftMousePressed({65, 60});
radioButton->leftMouseReleased({65, 60});
radioButton->leftMousePressed({105, 90});
radioButton->leftMouseReleased({105, 90});
REQUIRE(checkCount == 1);
REQUIRE(uncheckCount == 0);

View File

@ -144,21 +144,21 @@ TEST_CASE("[SpinButton]")
parent->setPosition(60, 55);
parent->add(spinButton);
parent->leftMousePressed({50, 45});
parent->leftMousePressed({110, 100});
REQUIRE(valueChangedCount == 1);
REQUIRE(spinButton->getValue() == 10);
parent->leftMouseReleased({50, 45});
parent->leftMouseReleased({110, 100});
REQUIRE(valueChangedCount == 2);
REQUIRE(spinButton->getValue() == 11);
parent->leftMousePressed({50, 75});
parent->leftMouseReleased({50, 75});
parent->leftMousePressed({110, 135});
parent->leftMouseReleased({110, 135});
REQUIRE(valueChangedCount == 3);
REQUIRE(spinButton->getValue() == 10);
parent->leftMousePressed({50, 75});
parent->leftMouseReleased({50, 75});
parent->leftMousePressed({110, 135});
parent->leftMouseReleased({110, 135});
REQUIRE(valueChangedCount == 3);
REQUIRE(spinButton->getValue() == 10);
}