From f9bf8c53dae0fbe170d036727ced2012888d8bbe Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 1 Jun 2017 01:09:49 +0300 Subject: Add other constructors into windows creation tests. --- src/gui/windowmanager_unittest.cc | 65 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc index 3810252ab..0928cb121 100644 --- a/src/gui/windowmanager_unittest.cc +++ b/src/gui/windowmanager_unittest.cc @@ -51,6 +51,7 @@ #include "gui/popups/textpopup.h" #include "gui/widgets/desktop.h" +#include "gui/widgets/emoteshortcutcontainer.h" #include "gui/widgets/createwidget.h" #include "gui/windows/bankwindow.h" @@ -212,7 +213,15 @@ TEST_CASE("Windows tests", "windowmanager") mainGraphics->updateScreen(); delete2(bankWindow); } - SECTION("buyDialog") + SECTION("buyDialog1") + { + BuyDialog *dialog; + CREATEWIDGETV0(dialog, BuyDialog); + gui->draw(); + mainGraphics->updateScreen(); + delete2(dialog); + } + SECTION("buyDialog2") { BuyDialog *dialog; CREATEWIDGETV(dialog, BuyDialog, @@ -222,6 +231,37 @@ TEST_CASE("Windows tests", "windowmanager") mainGraphics->updateScreen(); delete2(dialog); } +#ifdef TMWA_SUPPORT + SECTION("buyDialog3") + { + BuyDialog *dialog; + CREATEWIDGETV(dialog, BuyDialog, + "user", + DEFAULT_CURRENCY); + gui->draw(); + mainGraphics->updateScreen(); + delete2(dialog); + } +#endif // TMWA_SUPPORT + SECTION("buyDialog4") + { + BuyDialog *dialog; + BeingTypeId id = static_cast(1); + Map *map = new Map("test map", + 10, 10, + 32, 32); + Being *being = new Being(BeingId_zero, + ActorType::Avatar, + id, + map); + CREATEWIDGETV(dialog, BuyDialog, + being, + DEFAULT_CURRENCY); + gui->draw(); + mainGraphics->updateScreen(); + delete2(dialog); + delete2(being); + } SECTION("BuyingStoreSellDialog") { BuyingStoreSellDialog *dialog; @@ -231,7 +271,7 @@ TEST_CASE("Windows tests", "windowmanager") mainGraphics->updateScreen(); delete2(dialog); } - SECTION("BuySellDialog") + SECTION("BuySellDialog1") { BuySellDialog *dialog; CREATEWIDGETV(dialog, BuySellDialog, BeingId_zero); @@ -239,6 +279,14 @@ TEST_CASE("Windows tests", "windowmanager") mainGraphics->updateScreen(); delete2(dialog); } + SECTION("BuySellDialog2") + { + BuySellDialog *dialog; + CREATEWIDGETV(dialog, BuySellDialog, "user"); + gui->draw(); + mainGraphics->updateScreen(); + delete2(dialog); + } SECTION("ChangeEmailDialog") { LoginData data; @@ -561,7 +609,18 @@ TEST_CASE("Windows tests", "windowmanager") mainGraphics->updateScreen(); delete2(shopWindow); } - SECTION("ShortcutWindow") + SECTION("ShortcutWindow1") + { + EmoteShortcutContainer *container = + new EmoteShortcutContainer(nullptr); + CREATEWIDGETV(itemShortcutWindow, ShortcutWindow, + "name", + container); + gui->draw(); + mainGraphics->updateScreen(); + delete2(itemShortcutWindow); + } + SECTION("ShortcutWindow2") { CREATEWIDGETV(itemShortcutWindow, ShortcutWindow, ""); gui->draw(); -- cgit v1.2.3-60-g2f50