mirror of
https://github.com/godotengine/godot.git
synced 2025-12-08 06:09:55 +00:00
Use initializer list in Arrays
This commit is contained in:
parent
594d64ec24
commit
75881f8322
72 changed files with 347 additions and 947 deletions
|
|
@ -58,10 +58,7 @@ TEST_CASE("[HTTPClient] query_string_from_dict") {
|
|||
Dictionary dict2;
|
||||
dict2["key1"] = "value";
|
||||
dict2["key2"] = 123;
|
||||
Array values;
|
||||
values.push_back(1);
|
||||
values.push_back(2);
|
||||
values.push_back(3);
|
||||
Array values = { 1, 2, 3 };
|
||||
dict2["key3"] = values;
|
||||
dict2["key4"] = Variant();
|
||||
String multiple_keys = client->query_string_from_dict(dict2);
|
||||
|
|
|
|||
|
|
@ -152,15 +152,7 @@ TEST_CASE("[JSON] Parsing escape sequences") {
|
|||
|
||||
JSON json;
|
||||
|
||||
TypedArray<String> valid_escapes;
|
||||
valid_escapes.push_back("\";\"");
|
||||
valid_escapes.push_back("\\;\\");
|
||||
valid_escapes.push_back("/;/");
|
||||
valid_escapes.push_back("b;\b");
|
||||
valid_escapes.push_back("f;\f");
|
||||
valid_escapes.push_back("n;\n");
|
||||
valid_escapes.push_back("r;\r");
|
||||
valid_escapes.push_back("t;\t");
|
||||
TypedArray<String> valid_escapes = { "\";\"", "\\;\\", "/;/", "b;\b", "f;\f", "n;\n", "r;\r", "t;\t" };
|
||||
|
||||
SUBCASE("Basic valid escape sequences") {
|
||||
for (int i = 0; i < valid_escapes.size(); i++) {
|
||||
|
|
|
|||
|
|
@ -161,25 +161,13 @@ TEST_CASE("[JSON][Native] Conversion between native and JSON formats") {
|
|||
|
||||
// `Array`.
|
||||
|
||||
Array arr;
|
||||
arr.push_back(true);
|
||||
arr.push_back(1);
|
||||
arr.push_back("abc");
|
||||
|
||||
Array arr = { true, 1, "abc" };
|
||||
test(arr, R"([true,"i:1","s:abc"])");
|
||||
|
||||
TypedArray<int64_t> int_arr;
|
||||
int_arr.push_back(1);
|
||||
int_arr.push_back(2);
|
||||
int_arr.push_back(3);
|
||||
|
||||
TypedArray<int64_t> int_arr = { 1, 2, 3 };
|
||||
test(int_arr, R"({"type":"Array","elem_type":"int","args":["i:1","i:2","i:3"]})");
|
||||
|
||||
Array arr2;
|
||||
arr2.push_back(1);
|
||||
arr2.push_back(res);
|
||||
arr2.push_back(9);
|
||||
|
||||
Array arr2 = { 1, res, 9 };
|
||||
const String arr2_repr = vformat(R"(["i:1",%s,"i:9"])", res_repr);
|
||||
|
||||
test(arr2, arr2_repr, true);
|
||||
|
|
@ -188,9 +176,7 @@ TEST_CASE("[JSON][Native] Conversion between native and JSON formats") {
|
|||
CHECK(decode(arr2_repr).get_construct_string() == "[1, null, 9]");
|
||||
ERR_PRINT_ON;
|
||||
|
||||
TypedArray<Resource> res_arr;
|
||||
res_arr.push_back(res);
|
||||
|
||||
TypedArray<Resource> res_arr = { res };
|
||||
const String res_arr_repr = vformat(R"({"type":"Array","elem_type":"Resource","args":[%s]})", res_repr);
|
||||
|
||||
test(res_arr, res_arr_repr, true);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue