diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/input_default.cpp | 8 | ||||
| -rw-r--r-- | main/tests/test_string.cpp | 28 |
2 files changed, 33 insertions, 3 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp index 2b7bc3f671..18b4649f4d 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -1084,7 +1084,7 @@ Array InputDefault::get_connected_joypads() { return ret; } -static const char *_buttons[] = { +static const char *_buttons[JOY_BUTTON_MAX] = { "Face Button Bottom", "Face Button Right", "Face Button Left", @@ -1103,7 +1103,7 @@ static const char *_buttons[] = { "DPAD Right" }; -static const char *_axes[] = { +static const char *_axes[JOY_AXIS_MAX] = { "Left Stick X", "Left Stick Y", "Right Stick X", @@ -1111,7 +1111,9 @@ static const char *_axes[] = { "", "", "L2", - "R2" + "R2", + "", + "" }; String InputDefault::get_joy_button_string(int p_button) { diff --git a/main/tests/test_string.cpp b/main/tests/test_string.cpp index ddc36e807c..b4aeb4d215 100644 --- a/main/tests/test_string.cpp +++ b/main/tests/test_string.cpp @@ -942,6 +942,33 @@ bool test_30() { OS::get_singleton()->print("Capitalize %ls: %ls, %s\n", input.c_str(), output.c_str(), success ? "OK" : "FAIL"); return state; +} + +bool test_31() { + bool state = true; + bool success; + + String a = ""; + success = a[0] == 0; + OS::get_singleton()->print("Is 0 String[0]:, %s\n", success ? "OK" : "FAIL"); + if (!success) state = false; + + String b = "Godot"; + success = b[b.size()] == 0; + OS::get_singleton()->print("Is 0 String[size()]:, %s\n", success ? "OK" : "FAIL"); + if (!success) state = false; + + const String c = ""; + success = c[0] == 0; + OS::get_singleton()->print("Is 0 const String[0]:, %s\n", success ? "OK" : "FAIL"); + if (!success) state = false; + + const String d = "Godot"; + success = d[d.size()] == 0; + OS::get_singleton()->print("Is 0 const String[size()]:, %s\n", success ? "OK" : "FAIL"); + if (!success) state = false; + + return state; }; typedef bool (*TestFunc)(void); @@ -978,6 +1005,7 @@ TestFunc test_funcs[] = { test_28, test_29, test_30, + test_31, 0 }; |