pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish action_context tests

Browse Source
This commit is contained in:
patrick96 2021-02-03 19:42:11 +01:00 committed by Patrick Ziegler
parent c4fbf0023e
commit cfc6f3b45f
2 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/tags/action_context.hpp
View File

@ -67,6 +67,12 @@ namespace tags {
} }
}; };
/**
* Stores information about all action blocks on the bar.
*
* This class is used during rendering to open and close action blocks and
* in between render cycles to look up actions at certain positions.
*/
class action_context { class action_context {
public: public:
void reset(); void reset();

50
tests/unit_tests/tags/action_context.cpp
View File

@ -10,22 +10,26 @@ using namespace tags;
TEST(ActionCtxtTest, dblClick) { TEST(ActionCtxtTest, dblClick) {
action_context ctxt; action_context ctxt;
EXPECT_FALSE(ctxt.has_double_click());
ctxt.action_open(mousebtn::DOUBLE_LEFT, "", alignment::LEFT, 0); ctxt.action_open(mousebtn::DOUBLE_LEFT, "", alignment::LEFT, 0);
ctxt.action_close(mousebtn::DOUBLE_LEFT, alignment::LEFT, 1); ctxt.action_close(mousebtn::DOUBLE_LEFT, alignment::LEFT, 1);
ASSERT_TRUE(ctxt.has_double_click()); EXPECT_TRUE(ctxt.has_double_click());
ctxt.reset(); ctxt.reset();
ctxt.action_open(mousebtn::DOUBLE_MIDDLE, "", alignment::LEFT, 0); ctxt.action_open(mousebtn::DOUBLE_MIDDLE, "", alignment::LEFT, 0);
ctxt.action_close(mousebtn::DOUBLE_MIDDLE, alignment::LEFT, 1); ctxt.action_close(mousebtn::DOUBLE_MIDDLE, alignment::LEFT, 1);
ASSERT_TRUE(ctxt.has_double_click()); EXPECT_TRUE(ctxt.has_double_click());
ctxt.reset();
ctxt.action_open(mousebtn::DOUBLE_RIGHT, "", alignment::LEFT, 0); ctxt.action_open(mousebtn::DOUBLE_RIGHT, "", alignment::LEFT, 0);
ctxt.action_close(mousebtn::DOUBLE_RIGHT, alignment::LEFT, 1); ctxt.action_close(mousebtn::DOUBLE_RIGHT, alignment::LEFT, 1);
ASSERT_TRUE(ctxt.has_double_click()); EXPECT_TRUE(ctxt.has_double_click());
} }
TEST(ActionCtxtTest, closing) { TEST(ActionCtxtTest, closing) {
@ -41,12 +45,30 @@ TEST(ActionCtxtTest, closing) {
EXPECT_NE(NO_ACTION, id3); EXPECT_NE(NO_ACTION, id3);
EXPECT_NE(NO_ACTION, id4); EXPECT_NE(NO_ACTION, id4);
EXPECT_EQ(4, ctxt.num_unclosed());
EXPECT_EQ(make_pair(id1, mousebtn::LEFT), ctxt.action_close(mousebtn::LEFT, alignment::LEFT, 1)); EXPECT_EQ(make_pair(id1, mousebtn::LEFT), ctxt.action_close(mousebtn::LEFT, alignment::LEFT, 1));
EXPECT_EQ(3, ctxt.num_unclosed());
EXPECT_EQ(make_pair(id4, mousebtn::MIDDLE), ctxt.action_close(mousebtn::NONE, alignment::LEFT, 1)); EXPECT_EQ(make_pair(id4, mousebtn::MIDDLE), ctxt.action_close(mousebtn::NONE, alignment::LEFT, 1));
EXPECT_EQ(2, ctxt.num_unclosed());
EXPECT_EQ(make_pair(id3, mousebtn::RIGHT), ctxt.action_close(mousebtn::NONE, alignment::LEFT, 1)); EXPECT_EQ(make_pair(id3, mousebtn::RIGHT), ctxt.action_close(mousebtn::NONE, alignment::LEFT, 1));
EXPECT_EQ(1, ctxt.num_unclosed());
EXPECT_EQ(make_pair(id2, mousebtn::RIGHT), ctxt.action_close(mousebtn::NONE, alignment::CENTER, 1)); EXPECT_EQ(make_pair(id2, mousebtn::RIGHT), ctxt.action_close(mousebtn::NONE, alignment::CENTER, 1));
EXPECT_EQ(0, ctxt.num_unclosed());
EXPECT_EQ(4, ctxt.num_actions()); EXPECT_EQ(4, ctxt.num_actions());
}
TEST(ActionCtxtTest, doubleClosing) {
action_context ctxt;
auto id = ctxt.action_open(mousebtn::LEFT, "", alignment::LEFT, 0);
EXPECT_NE(NO_ACTION, id);
EXPECT_EQ(1, ctxt.num_unclosed());
EXPECT_EQ(make_pair(id, mousebtn::LEFT), ctxt.action_close(mousebtn::LEFT, alignment::LEFT, 1));
EXPECT_EQ(0, ctxt.num_unclosed());
EXPECT_EQ(make_pair(tags::NO_ACTION, mousebtn::NONE), ctxt.action_close(mousebtn::LEFT, alignment::LEFT, 1));
EXPECT_EQ(0, ctxt.num_unclosed()); EXPECT_EQ(0, ctxt.num_unclosed());
} }
@ -122,5 +144,25 @@ TEST(ActionCtxtTest, cmd) {
auto id = ctxt.action_open(mousebtn::DOUBLE_RIGHT, cmd.substr(), alignment::RIGHT, 0); auto id = ctxt.action_open(mousebtn::DOUBLE_RIGHT, cmd.substr(), alignment::RIGHT, 0);
ASSERT_EQ(cmd, ctxt.get_action(id)); EXPECT_EQ(cmd, ctxt.get_action(id));
}
TEST(ActionCtxtTest, getActionBlocks) {
action_context ctxt;
ctxt.action_open(mousebtn::DOUBLE_MIDDLE, "", alignment::RIGHT, 0);
ctxt.action_close(mousebtn::DOUBLE_MIDDLE, alignment::RIGHT, 1);
const auto& blocks = ctxt.get_blocks();
ASSERT_EQ(1, blocks.size());
const auto block = blocks[0];
EXPECT_EQ("", block.cmd);
EXPECT_EQ(0, block.start_x);
EXPECT_EQ(1, block.end_x);
EXPECT_FALSE(block.is_open);
EXPECT_EQ(mousebtn::DOUBLE_MIDDLE, block.button);
EXPECT_EQ(alignment::RIGHT, block.align);
} }