tour/minetest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore basic tests

Browse Source
This commit is contained in:
y5nw 2024-08-14 18:30:29 +02:00
parent d7372f1884
commit 906158b642
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/keycode.cpp
View File

@ -316,8 +316,9 @@ bool KeyPress::loadFromScancode(const std::string_view &name)
{ {
if (name.size() < 2 || name[0] != '<') if (name.size() < 2 || name[0] != '<')
return false; return false;
scancode = strtoul(name.data()+1, NULL, 10); char *p;
return scancode != 0; scancode = strtoul(name.data()+1, &p, 10);
return p > name.data()+1;
} }
std::unordered_map<std::string, KeyPress> KeyPress::specialKeyCache; std::unordered_map<std::string, KeyPress> KeyPress::specialKeyCache;

34
src/unittest/test_keycode.cpp
View File

@ -25,12 +25,11 @@ static TestKeycode g_test_instance;
void TestKeycode::runTests(IGameDef *gamedef) void TestKeycode::runTests(IGameDef *gamedef)
{ {
// TODO: How do we test this without an IrrlichtDevice? // TODO: Complement the test when we fully switch to SDL.
#if 0 // Old test cases are kept for completeness.
TEST(testCreateFromString); TEST(testCreateFromString);
TEST(testCreateFromSKeyInput); TEST(testCreateFromSKeyInput);
TEST(testCompare); TEST(testCompare);
#endif
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -42,10 +41,16 @@ void TestKeycode::testCreateFromString()
{ {
KeyPress k; KeyPress k;
k = KeyPress(""); k = KeyPress();
UASSERTEQ_STR(k.sym(), ""); UASSERTEQ_STR(k.sym(true), "");
UASSERTEQ_STR(k.name(), "");
k = KeyPress("<0>");
UASSERTEQ_STR(k.sym(true), "");
k = KeyPress("<20>");
UASSERTEQ_STR(k.sym(true), "<20>");
/*
// Character key, from char // Character key, from char
k = KeyPress("R"); k = KeyPress("R");
UASSERTEQ_STR(k.sym(), "KEY_KEY_R"); UASSERTEQ_STR(k.sym(), "KEY_KEY_R");
@ -69,6 +74,7 @@ void TestKeycode::testCreateFromString()
k = KeyPress("/"); k = KeyPress("/");
UASSERTEQ_STR(k.sym(), "/"); UASSERTEQ_STR(k.sym(), "/");
UASSERT_HAS_NAME(k); UASSERT_HAS_NAME(k);
*/
} }
template<typename ...Args> template<typename ...Args>
@ -82,6 +88,11 @@ void TestKeycode::testCreateFromSKeyInput()
KeyPress k; KeyPress k;
irr::SEvent::SKeyInput in; irr::SEvent::SKeyInput in;
in.SystemKeyCode = 20;
k = KeyPress(in);
UASSERTEQ_STR(k.sym(true), "<20>");
/*
// Character key // Character key
in.SystemKeyCode = toScancode(irr::KEY_KEY_3, L'3'); in.SystemKeyCode = toScancode(irr::KEY_KEY_3, L'3');
k = KeyPress(in); k = KeyPress(in);
@ -99,13 +110,19 @@ void TestKeycode::testCreateFromSKeyInput()
k = KeyPress(in); k = KeyPress(in);
UASSERTEQ_STR(k.sym(), "?"); UASSERTEQ_STR(k.sym(), "?");
UASSERT_HAS_NAME(k); UASSERT_HAS_NAME(k);
*/
} }
void TestKeycode::testCompare() void TestKeycode::testCompare()
{ {
// "Empty" key // "Empty" key
UASSERT(KeyPress() == KeyPress("")); UASSERT(KeyPress() == KeyPress("<0>"));
irr::SEvent::SKeyInput in;
in.SystemKeyCode = 20;
UASSERT(KeyPress(in) == KeyPress("<20>"));
/*
// Basic comparison // Basic comparison
UASSERT(KeyPress("5") == KeyPress("KEY_KEY_5")); UASSERT(KeyPress("5") == KeyPress("KEY_KEY_5"));
UASSERT(!(KeyPress("5") == KeyPress("KEY_NUMPAD5"))); UASSERT(!(KeyPress("5") == KeyPress("KEY_NUMPAD5")));
@ -114,15 +131,14 @@ void TestKeycode::testCompare()
// note: This is a real-world example, Irrlicht maps XK_equal to irr::KEY_PLUS on Linux // note: This is a real-world example, Irrlicht maps XK_equal to irr::KEY_PLUS on Linux
// TODO: Is this still relevant for scancodes? // TODO: Is this still relevant for scancodes?
irr::SEvent::SKeyInput in; irr::SEvent::SKeyInput in;
/*
in.Key = irr::KEY_PLUS; in.Key = irr::KEY_PLUS;
in.Char = L'='; in.Char = L'=';
UASSERT(KeyPress("=") == KeyPress(in)); UASSERT(KeyPress("=") == KeyPress(in));
*/
// Matching keycode suffices // Matching keycode suffices
irr::SEvent::SKeyInput in2; irr::SEvent::SKeyInput in2;
in.SystemKeyCode = toScancode(irr::KEY_OEM_CLEAR, L'\0'); in.SystemKeyCode = toScancode(irr::KEY_OEM_CLEAR, L'\0');
in2.SystemKeyCode = toScancode(irr::KEY_OEM_CLEAR, L';'); in2.SystemKeyCode = toScancode(irr::KEY_OEM_CLEAR, L';');
UASSERT(KeyPress(in) == KeyPress(in2)); UASSERT(KeyPress(in) == KeyPress(in2));
*/
} }