mirror of
https://github.com/RGBCube/serenity
synced 2025-07-30 06:57:45 +00:00
AK+Everywhere: Rename String to DeprecatedString
We have a new, improved string type coming up in AK (OOM aware, no null state), and while it's going to use UTF-8, the name UTF8String is a mouthful - so let's free up the String name by renaming the existing class. Making the old one have an annoying name will hopefully also help with quick adoption :^)
This commit is contained in:
Linus Groh
Andreas Kling
parent
f74251606d
commit
6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
|
|
@ -19,6 +19,7 @@ set(AK_TEST_SOURCES
|
|||
TestCircularDuplexStream.cpp
|
||||
TestCircularQueue.cpp
|
||||
TestComplex.cpp
|
||||
TestDeprecatedString.cpp
|
||||
TestDisjointChunks.cpp
|
||||
TestDistinctNumeric.cpp
|
||||
TestDoublyLinkedList.cpp
|
||||
|
|
@ -61,7 +62,6 @@ set(AK_TEST_SOURCES
|
|||
TestSpan.cpp
|
||||
TestStack.cpp
|
||||
TestStdLibExtras.cpp
|
||||
TestString.cpp
|
||||
TestStringFloatingPointConversions.cpp
|
||||
TestStringUtils.cpp
|
||||
TestStringView.cpp
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/Base64.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <string.h>
|
||||
|
||||
TEST_CASE(test_decode)
|
||||
|
|
@ -16,7 +16,7 @@ TEST_CASE(test_decode)
|
|||
auto decoded_option = decode_base64(input);
|
||||
EXPECT(!decoded_option.is_error());
|
||||
auto decoded = decoded_option.release_value();
|
||||
EXPECT(String::copy(decoded) == expected);
|
||||
EXPECT(DeprecatedString::copy(decoded) == expected);
|
||||
EXPECT(expected.length() <= calculate_base64_decoded_length(input.bytes()));
|
||||
};
|
||||
|
||||
|
|
@ -43,7 +43,7 @@ TEST_CASE(test_encode)
|
|||
{
|
||||
auto encode_equal = [&](StringView input, StringView expected) {
|
||||
auto encoded = encode_base64(input.bytes());
|
||||
EXPECT(encoded == String(expected));
|
||||
EXPECT(encoded == DeprecatedString(expected));
|
||||
EXPECT_EQ(expected.length(), calculate_base64_encoded_length(input.bytes()));
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/BinaryHeap.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
|
||||
TEST_CASE(construct)
|
||||
{
|
||||
|
|
@ -44,7 +44,7 @@ TEST_CASE(populate_int)
|
|||
|
||||
TEST_CASE(populate_string)
|
||||
{
|
||||
BinaryHeap<int, String, 5> strings;
|
||||
BinaryHeap<int, DeprecatedString, 5> strings;
|
||||
strings.insert(1, "ABC");
|
||||
strings.insert(2, "DEF");
|
||||
EXPECT_EQ(strings.size(), 2u);
|
||||
|
|
|
|||
|
|
@ -49,20 +49,20 @@ TEST_CASE(array_doubles)
|
|||
|
||||
TEST_CASE(vector_strings)
|
||||
{
|
||||
Vector<String> strings;
|
||||
Vector<DeprecatedString> strings;
|
||||
strings.append("bat");
|
||||
strings.append("cat");
|
||||
strings.append("dog");
|
||||
|
||||
auto string_compare = [](String const& a, String const& b) -> int {
|
||||
auto string_compare = [](DeprecatedString const& a, DeprecatedString const& b) -> int {
|
||||
return strcmp(a.characters(), b.characters());
|
||||
};
|
||||
auto test1 = *binary_search(strings, String("bat"), nullptr, string_compare);
|
||||
auto test2 = *binary_search(strings, String("cat"), nullptr, string_compare);
|
||||
auto test3 = *binary_search(strings, String("dog"), nullptr, string_compare);
|
||||
EXPECT_EQ(test1, String("bat"));
|
||||
EXPECT_EQ(test2, String("cat"));
|
||||
EXPECT_EQ(test3, String("dog"));
|
||||
auto test1 = *binary_search(strings, DeprecatedString("bat"), nullptr, string_compare);
|
||||
auto test2 = *binary_search(strings, DeprecatedString("cat"), nullptr, string_compare);
|
||||
auto test3 = *binary_search(strings, DeprecatedString("dog"), nullptr, string_compare);
|
||||
EXPECT_EQ(test1, DeprecatedString("bat"));
|
||||
EXPECT_EQ(test2, DeprecatedString("cat"));
|
||||
EXPECT_EQ(test3, DeprecatedString("dog"));
|
||||
}
|
||||
|
||||
TEST_CASE(single_element)
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/CircularDeque.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/StdLibExtras.h>
|
||||
#include <AK/String.h>
|
||||
|
||||
TEST_CASE(enqueue_begin)
|
||||
{
|
||||
|
|
@ -37,9 +37,9 @@ TEST_CASE(enqueue_begin)
|
|||
|
||||
TEST_CASE(enqueue_begin_being_moved_from)
|
||||
{
|
||||
CircularDeque<String, 2> strings;
|
||||
CircularDeque<DeprecatedString, 2> strings;
|
||||
|
||||
String str { "test" };
|
||||
DeprecatedString str { "test" };
|
||||
strings.enqueue_begin(move(str));
|
||||
EXPECT(str.is_null());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/CircularQueue.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
|
||||
TEST_CASE(basic)
|
||||
{
|
||||
|
|
@ -28,7 +28,7 @@ TEST_CASE(basic)
|
|||
|
||||
TEST_CASE(complex_type)
|
||||
{
|
||||
CircularQueue<String, 2> strings;
|
||||
CircularQueue<DeprecatedString, 2> strings;
|
||||
|
||||
strings.enqueue("ABC");
|
||||
strings.enqueue("DEF");
|
||||
|
|
@ -44,7 +44,7 @@ TEST_CASE(complex_type)
|
|||
|
||||
TEST_CASE(complex_type_clear)
|
||||
{
|
||||
CircularQueue<String, 5> strings;
|
||||
CircularQueue<DeprecatedString, 5> strings;
|
||||
strings.enqueue("xxx");
|
||||
strings.enqueue("xxx");
|
||||
strings.enqueue("xxx");
|
||||
|
|
|
|||
|
|
@ -6,28 +6,28 @@
|
|||
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/FlyString.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/StringBuilder.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <cstring>
|
||||
|
||||
TEST_CASE(construct_empty)
|
||||
{
|
||||
EXPECT(String().is_null());
|
||||
EXPECT(String().is_empty());
|
||||
EXPECT(!String().characters());
|
||||
EXPECT(DeprecatedString().is_null());
|
||||
EXPECT(DeprecatedString().is_empty());
|
||||
EXPECT(!DeprecatedString().characters());
|
||||
|
||||
EXPECT(!String("").is_null());
|
||||
EXPECT(String("").is_empty());
|
||||
EXPECT(String("").characters() != nullptr);
|
||||
EXPECT(!DeprecatedString("").is_null());
|
||||
EXPECT(DeprecatedString("").is_empty());
|
||||
EXPECT(DeprecatedString("").characters() != nullptr);
|
||||
|
||||
EXPECT(String("").impl() == String::empty().impl());
|
||||
EXPECT(DeprecatedString("").impl() == DeprecatedString::empty().impl());
|
||||
}
|
||||
|
||||
TEST_CASE(construct_contents)
|
||||
{
|
||||
String test_string = "ABCDEF";
|
||||
DeprecatedString test_string = "ABCDEF";
|
||||
EXPECT(!test_string.is_empty());
|
||||
EXPECT(!test_string.is_null());
|
||||
EXPECT_EQ(test_string.length(), 6u);
|
||||
|
|
@ -42,45 +42,45 @@ TEST_CASE(construct_contents)
|
|||
|
||||
TEST_CASE(equal)
|
||||
{
|
||||
EXPECT_NE(String::empty(), String {});
|
||||
EXPECT_NE(DeprecatedString::empty(), DeprecatedString {});
|
||||
}
|
||||
|
||||
TEST_CASE(compare)
|
||||
{
|
||||
EXPECT("a"sv < String("b"));
|
||||
EXPECT(!("a"sv > String("b")));
|
||||
EXPECT("b"sv > String("a"));
|
||||
EXPECT(!("b"sv < String("b")));
|
||||
EXPECT("a"sv >= String("a"));
|
||||
EXPECT(!("a"sv >= String("b")));
|
||||
EXPECT("a"sv <= String("a"));
|
||||
EXPECT(!("b"sv <= String("a")));
|
||||
EXPECT("a"sv < DeprecatedString("b"));
|
||||
EXPECT(!("a"sv > DeprecatedString("b")));
|
||||
EXPECT("b"sv > DeprecatedString("a"));
|
||||
EXPECT(!("b"sv < DeprecatedString("b")));
|
||||
EXPECT("a"sv >= DeprecatedString("a"));
|
||||
EXPECT(!("a"sv >= DeprecatedString("b")));
|
||||
EXPECT("a"sv <= DeprecatedString("a"));
|
||||
EXPECT(!("b"sv <= DeprecatedString("a")));
|
||||
|
||||
EXPECT(String("a") > String());
|
||||
EXPECT(!(String() > String("a")));
|
||||
EXPECT(String() < String("a"));
|
||||
EXPECT(!(String("a") < String()));
|
||||
EXPECT(String("a") >= String());
|
||||
EXPECT(!(String() >= String("a")));
|
||||
EXPECT(String() <= String("a"));
|
||||
EXPECT(!(String("a") <= String()));
|
||||
EXPECT(DeprecatedString("a") > DeprecatedString());
|
||||
EXPECT(!(DeprecatedString() > DeprecatedString("a")));
|
||||
EXPECT(DeprecatedString() < DeprecatedString("a"));
|
||||
EXPECT(!(DeprecatedString("a") < DeprecatedString()));
|
||||
EXPECT(DeprecatedString("a") >= DeprecatedString());
|
||||
EXPECT(!(DeprecatedString() >= DeprecatedString("a")));
|
||||
EXPECT(DeprecatedString() <= DeprecatedString("a"));
|
||||
EXPECT(!(DeprecatedString("a") <= DeprecatedString()));
|
||||
|
||||
EXPECT(!(String() > String()));
|
||||
EXPECT(!(String() < String()));
|
||||
EXPECT(String() >= String());
|
||||
EXPECT(String() <= String());
|
||||
EXPECT(!(DeprecatedString() > DeprecatedString()));
|
||||
EXPECT(!(DeprecatedString() < DeprecatedString()));
|
||||
EXPECT(DeprecatedString() >= DeprecatedString());
|
||||
EXPECT(DeprecatedString() <= DeprecatedString());
|
||||
}
|
||||
|
||||
TEST_CASE(index_access)
|
||||
{
|
||||
String test_string = "ABCDEF";
|
||||
DeprecatedString test_string = "ABCDEF";
|
||||
EXPECT_EQ(test_string[0], 'A');
|
||||
EXPECT_EQ(test_string[1], 'B');
|
||||
}
|
||||
|
||||
TEST_CASE(starts_with)
|
||||
{
|
||||
String test_string = "ABCDEF";
|
||||
DeprecatedString test_string = "ABCDEF";
|
||||
EXPECT(test_string.starts_with("AB"sv));
|
||||
EXPECT(test_string.starts_with('A'));
|
||||
EXPECT(!test_string.starts_with('B'));
|
||||
|
|
@ -92,7 +92,7 @@ TEST_CASE(starts_with)
|
|||
|
||||
TEST_CASE(ends_with)
|
||||
{
|
||||
String test_string = "ABCDEF";
|
||||
DeprecatedString test_string = "ABCDEF";
|
||||
EXPECT(test_string.ends_with("EF"sv));
|
||||
EXPECT(test_string.ends_with('F'));
|
||||
EXPECT(!test_string.ends_with('E'));
|
||||
|
|
@ -104,7 +104,7 @@ TEST_CASE(ends_with)
|
|||
|
||||
TEST_CASE(copy_string)
|
||||
{
|
||||
String test_string = "ABCDEF";
|
||||
DeprecatedString test_string = "ABCDEF";
|
||||
auto test_string_copy = test_string;
|
||||
EXPECT_EQ(test_string, test_string_copy);
|
||||
EXPECT_EQ(test_string.characters(), test_string_copy.characters());
|
||||
|
|
@ -112,7 +112,7 @@ TEST_CASE(copy_string)
|
|||
|
||||
TEST_CASE(move_string)
|
||||
{
|
||||
String test_string = "ABCDEF";
|
||||
DeprecatedString test_string = "ABCDEF";
|
||||
auto test_string_copy = test_string;
|
||||
auto test_string_move = move(test_string_copy);
|
||||
EXPECT_EQ(test_string, test_string_move);
|
||||
|
|
@ -121,25 +121,25 @@ TEST_CASE(move_string)
|
|||
|
||||
TEST_CASE(repeated)
|
||||
{
|
||||
EXPECT_EQ(String::repeated('x', 0), "");
|
||||
EXPECT_EQ(String::repeated('x', 1), "x");
|
||||
EXPECT_EQ(String::repeated('x', 2), "xx");
|
||||
EXPECT_EQ(DeprecatedString::repeated('x', 0), "");
|
||||
EXPECT_EQ(DeprecatedString::repeated('x', 1), "x");
|
||||
EXPECT_EQ(DeprecatedString::repeated('x', 2), "xx");
|
||||
}
|
||||
|
||||
TEST_CASE(to_int)
|
||||
{
|
||||
EXPECT_EQ(String("123").to_int().value(), 123);
|
||||
EXPECT_EQ(String("-123").to_int().value(), -123);
|
||||
EXPECT_EQ(DeprecatedString("123").to_int().value(), 123);
|
||||
EXPECT_EQ(DeprecatedString("-123").to_int().value(), -123);
|
||||
}
|
||||
|
||||
TEST_CASE(to_lowercase)
|
||||
{
|
||||
EXPECT(String("ABC").to_lowercase() == "abc");
|
||||
EXPECT(DeprecatedString("ABC").to_lowercase() == "abc");
|
||||
}
|
||||
|
||||
TEST_CASE(to_uppercase)
|
||||
{
|
||||
EXPECT(String("AbC").to_uppercase() == "ABC");
|
||||
EXPECT(DeprecatedString("AbC").to_uppercase() == "ABC");
|
||||
}
|
||||
|
||||
TEST_CASE(flystring)
|
||||
|
|
@ -151,7 +151,7 @@ TEST_CASE(flystring)
|
|||
}
|
||||
|
||||
{
|
||||
String a = "foo";
|
||||
DeprecatedString a = "foo";
|
||||
FlyString b = a;
|
||||
StringBuilder builder;
|
||||
builder.append('f');
|
||||
|
|
@ -164,7 +164,7 @@ TEST_CASE(flystring)
|
|||
|
||||
TEST_CASE(replace)
|
||||
{
|
||||
String test_string = "Well, hello Friends!";
|
||||
DeprecatedString test_string = "Well, hello Friends!";
|
||||
|
||||
test_string = test_string.replace("Friends"sv, "Testers"sv, ReplaceMode::FirstOnly);
|
||||
EXPECT(test_string == "Well, hello Testers!");
|
||||
|
|
@ -175,7 +175,7 @@ TEST_CASE(replace)
|
|||
test_string = test_string.replace("!"sv, " :^)"sv, ReplaceMode::FirstOnly);
|
||||
EXPECT(test_string == "We're, he'reo Testers :^)");
|
||||
|
||||
test_string = String("111._.111._.111");
|
||||
test_string = DeprecatedString("111._.111._.111");
|
||||
test_string = test_string.replace("111"sv, "|||"sv, ReplaceMode::All);
|
||||
EXPECT(test_string == "|||._.|||._.|||");
|
||||
|
||||
|
|
@ -185,7 +185,7 @@ TEST_CASE(replace)
|
|||
|
||||
TEST_CASE(count)
|
||||
{
|
||||
String test_string = "Well, hello Friends!";
|
||||
DeprecatedString test_string = "Well, hello Friends!";
|
||||
u32 count = test_string.count("Friends"sv);
|
||||
EXPECT(count == 1);
|
||||
|
||||
|
|
@ -195,7 +195,7 @@ TEST_CASE(count)
|
|||
count = test_string.count("!"sv);
|
||||
EXPECT(count == 1);
|
||||
|
||||
test_string = String("111._.111._.111");
|
||||
test_string = DeprecatedString("111._.111._.111");
|
||||
count = test_string.count("111"sv);
|
||||
EXPECT(count == 3);
|
||||
|
||||
|
|
@ -205,7 +205,7 @@ TEST_CASE(count)
|
|||
|
||||
TEST_CASE(substring)
|
||||
{
|
||||
String test = "abcdef";
|
||||
DeprecatedString test = "abcdef";
|
||||
EXPECT_EQ(test.substring(0, 6), test);
|
||||
EXPECT_EQ(test.substring(0, 3), "abc");
|
||||
EXPECT_EQ(test.substring(3, 3), "def");
|
||||
|
|
@ -215,7 +215,7 @@ TEST_CASE(substring)
|
|||
|
||||
TEST_CASE(split)
|
||||
{
|
||||
String test = "foo bar baz";
|
||||
DeprecatedString test = "foo bar baz";
|
||||
auto parts = test.split(' ');
|
||||
EXPECT_EQ(parts.size(), 3u);
|
||||
EXPECT_EQ(parts[0], "foo");
|
||||
|
|
@ -259,7 +259,7 @@ TEST_CASE(builder_zero_initial_capacity)
|
|||
|
||||
TEST_CASE(find)
|
||||
{
|
||||
String a = "foobarbar";
|
||||
DeprecatedString a = "foobarbar";
|
||||
EXPECT_EQ(a.find("bar"sv), Optional<size_t> { 3 });
|
||||
EXPECT_EQ(a.find("baz"sv), Optional<size_t> {});
|
||||
EXPECT_EQ(a.find("bar"sv, 4), Optional<size_t> { 6 });
|
||||
|
|
@ -275,7 +275,7 @@ TEST_CASE(find)
|
|||
|
||||
TEST_CASE(find_with_empty_needle)
|
||||
{
|
||||
String string = "";
|
||||
DeprecatedString string = "";
|
||||
EXPECT_EQ(string.find(""sv), 0u);
|
||||
EXPECT_EQ(string.find_all(""sv), (Vector<size_t> { 0u }));
|
||||
|
||||
|
|
@ -286,30 +286,30 @@ TEST_CASE(find_with_empty_needle)
|
|||
|
||||
TEST_CASE(bijective_base)
|
||||
{
|
||||
EXPECT_EQ(String::bijective_base_from(0), "A");
|
||||
EXPECT_EQ(String::bijective_base_from(25), "Z");
|
||||
EXPECT_EQ(String::bijective_base_from(26), "AA");
|
||||
EXPECT_EQ(String::bijective_base_from(52), "BA");
|
||||
EXPECT_EQ(String::bijective_base_from(704), "ABC");
|
||||
EXPECT_EQ(DeprecatedString::bijective_base_from(0), "A");
|
||||
EXPECT_EQ(DeprecatedString::bijective_base_from(25), "Z");
|
||||
EXPECT_EQ(DeprecatedString::bijective_base_from(26), "AA");
|
||||
EXPECT_EQ(DeprecatedString::bijective_base_from(52), "BA");
|
||||
EXPECT_EQ(DeprecatedString::bijective_base_from(704), "ABC");
|
||||
}
|
||||
|
||||
TEST_CASE(roman_numerals)
|
||||
{
|
||||
auto zero = String::roman_number_from(0);
|
||||
auto zero = DeprecatedString::roman_number_from(0);
|
||||
EXPECT_EQ(zero, "");
|
||||
|
||||
auto one = String::roman_number_from(1);
|
||||
auto one = DeprecatedString::roman_number_from(1);
|
||||
EXPECT_EQ(one, "I");
|
||||
|
||||
auto nine = String::roman_number_from(9);
|
||||
auto nine = DeprecatedString::roman_number_from(9);
|
||||
EXPECT_EQ(nine, "IX");
|
||||
|
||||
auto fourty_eight = String::roman_number_from(48);
|
||||
auto fourty_eight = DeprecatedString::roman_number_from(48);
|
||||
EXPECT_EQ(fourty_eight, "XLVIII");
|
||||
|
||||
auto one_thousand_nine_hundred_ninety_eight = String::roman_number_from(1998);
|
||||
auto one_thousand_nine_hundred_ninety_eight = DeprecatedString::roman_number_from(1998);
|
||||
EXPECT_EQ(one_thousand_nine_hundred_ninety_eight, "MCMXCVIII");
|
||||
|
||||
auto four_thousand = String::roman_number_from(4000);
|
||||
auto four_thousand = DeprecatedString::roman_number_from(4000);
|
||||
EXPECT_EQ(four_thousand, "4000");
|
||||
}
|
||||
|
|
@ -6,9 +6,9 @@
|
|||
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/DisjointChunks.h>
|
||||
#include <AK/FixedArray.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/Vector.h>
|
||||
|
||||
TEST_CASE(basic)
|
||||
|
|
|
|||
|
|
@ -145,9 +145,9 @@ TEST_CASE(cast)
|
|||
|
||||
TEST_CASE(formatter)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{}", FixedPoint<16>(123.456)), "123.455993"sv);
|
||||
EXPECT_EQ(String::formatted("{}", FixedPoint<16>(-123.456)), "-123.455994"sv);
|
||||
EXPECT_EQ(String::formatted("{}", FixedPoint<4>(123.456)), "123.4375"sv);
|
||||
EXPECT_EQ(String::formatted("{}", FixedPoint<4>(-123.456)), "-123.4375"sv);
|
||||
EXPECT_EQ(String::formatted("{}", FixedPoint<16> {}), "0"sv);
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", FixedPoint<16>(123.456)), "123.455993"sv);
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", FixedPoint<16>(-123.456)), "-123.455994"sv);
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", FixedPoint<4>(123.456)), "123.4375"sv);
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", FixedPoint<4>(-123.456)), "-123.4375"sv);
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", FixedPoint<16> {}), "0"sv);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/String.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/StringBuilder.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <math.h>
|
||||
|
|
@ -20,42 +20,42 @@ TEST_CASE(is_integral_works_properly)
|
|||
|
||||
TEST_CASE(format_string_literals)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("prefix-{}-suffix", "abc"), "prefix-abc-suffix");
|
||||
EXPECT_EQ(String::formatted("{}{}{}", "a", "b", "c"), "abc");
|
||||
EXPECT_EQ(DeprecatedString::formatted("prefix-{}-suffix", "abc"), "prefix-abc-suffix");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}{}{}", "a", "b", "c"), "abc");
|
||||
}
|
||||
|
||||
TEST_CASE(format_integers)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{}", 42u), "42");
|
||||
EXPECT_EQ(String::formatted("{:4}", 42u), " 42");
|
||||
EXPECT_EQ(String::formatted("{:08}", 42u), "00000042");
|
||||
EXPECT_EQ(String::formatted("{:7}", -17), " -17");
|
||||
EXPECT_EQ(String::formatted("{}", -17), "-17");
|
||||
EXPECT_EQ(String::formatted("{:04}", 13), "0013");
|
||||
EXPECT_EQ(String::formatted("{:08x}", 4096), "00001000");
|
||||
EXPECT_EQ(String::formatted("{:x}", 0x1111222233334444ull), "1111222233334444");
|
||||
EXPECT_EQ(String::formatted("{:4}", 12345678), "12345678");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", 42u), "42");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:4}", 42u), " 42");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:08}", 42u), "00000042");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:7}", -17), " -17");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", -17), "-17");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:04}", 13), "0013");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:08x}", 4096), "00001000");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:x}", 0x1111222233334444ull), "1111222233334444");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:4}", 12345678), "12345678");
|
||||
}
|
||||
|
||||
TEST_CASE(reorder_format_arguments)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{1}{0}", "a", "b"), "ba");
|
||||
EXPECT_EQ(String::formatted("{0}{1}", "a", "b"), "ab");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{1}{0}", "a", "b"), "ba");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{0}{1}", "a", "b"), "ab");
|
||||
// Compiletime check bypass: ignoring a passed argument.
|
||||
EXPECT_EQ(String::formatted("{0}{0}{0}"sv, "a", "b"), "aaa");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{0}{0}{0}"sv, "a", "b"), "aaa");
|
||||
// Compiletime check bypass: ignoring a passed argument.
|
||||
EXPECT_EQ(String::formatted("{1}{}{0}"sv, "a", "b", "c"), "baa");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{1}{}{0}"sv, "a", "b", "c"), "baa");
|
||||
}
|
||||
|
||||
TEST_CASE(escape_braces)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{{{}", "foo"), "{foo");
|
||||
EXPECT_EQ(String::formatted("{}}}", "bar"), "bar}");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{{{}", "foo"), "{foo");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}}}", "bar"), "bar}");
|
||||
}
|
||||
|
||||
TEST_CASE(everything)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{{{:04}/{}/{0:8}/{1}", 42u, "foo"), "{0042/foo/ 42/foo");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{{{:04}/{}/{0:8}/{1}", 42u, "foo"), "{0042/foo/ 42/foo");
|
||||
}
|
||||
|
||||
TEST_CASE(string_builder)
|
||||
|
|
@ -69,85 +69,85 @@ TEST_CASE(string_builder)
|
|||
|
||||
TEST_CASE(format_without_arguments)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("foo"), "foo");
|
||||
EXPECT_EQ(DeprecatedString::formatted("foo"), "foo");
|
||||
}
|
||||
|
||||
TEST_CASE(format_upper_case_integer)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{:4X}", 0xff), " FF");
|
||||
EXPECT_EQ(String::formatted("{:#4X}", 0xff), "0XFF");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:4X}", 0xff), " FF");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:#4X}", 0xff), "0XFF");
|
||||
|
||||
EXPECT_EQ(String::formatted("{:b}", 0xff), "11111111");
|
||||
EXPECT_EQ(String::formatted("{:B}", 0xff), "11111111");
|
||||
EXPECT_EQ(String::formatted("{:#b}", 0xff), "0b11111111");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:b}", 0xff), "11111111");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:B}", 0xff), "11111111");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:#b}", 0xff), "0b11111111");
|
||||
}
|
||||
|
||||
TEST_CASE(format_aligned)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{:*<8}", 13), "13******");
|
||||
EXPECT_EQ(String::formatted("{:*^8}", 13), "***13***");
|
||||
EXPECT_EQ(String::formatted("{:*>8}", 13), "******13");
|
||||
EXPECT_EQ(String::formatted("{:*>+8}", 13), "*****+13");
|
||||
EXPECT_EQ(String::formatted("{:*^ 8}", 13), "** 13***");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:*<8}", 13), "13******");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:*^8}", 13), "***13***");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:*>8}", 13), "******13");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:*>+8}", 13), "*****+13");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:*^ 8}", 13), "** 13***");
|
||||
}
|
||||
|
||||
TEST_CASE(format_octal)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{:o}", 0744), "744");
|
||||
EXPECT_EQ(String::formatted("{:#o}", 0744), "0744");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:o}", 0744), "744");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:#o}", 0744), "0744");
|
||||
}
|
||||
|
||||
TEST_CASE(zero_pad)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{: <010}", 42), "42 ");
|
||||
EXPECT_EQ(String::formatted("{:010}", 42), "0000000042");
|
||||
EXPECT_EQ(String::formatted("{:/^010}", 42), "////42////");
|
||||
EXPECT_EQ(String::formatted("{:04x}", -32), "-0020");
|
||||
EXPECT_EQ(String::formatted("{:#06x}", -64), "-0x000040");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{: <010}", 42), "42 ");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:010}", 42), "0000000042");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:/^010}", 42), "////42////");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:04x}", -32), "-0020");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:#06x}", -64), "-0x000040");
|
||||
}
|
||||
|
||||
TEST_CASE(replacement_field)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{:*>{1}}", 13, static_cast<size_t>(10)), "********13");
|
||||
EXPECT_EQ(String::formatted("{:*<{1}}", 7, 4), "7***");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:*>{1}}", 13, static_cast<size_t>(10)), "********13");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:*<{1}}", 7, 4), "7***");
|
||||
// Compiletime check bypass: intentionally ignoring extra arguments
|
||||
EXPECT_EQ(String::formatted("{:{2}}"sv, -5, 8, 16), " -5");
|
||||
EXPECT_EQ(String::formatted("{{{:*^{1}}}}", 1, 3), "{*1*}");
|
||||
EXPECT_EQ(String::formatted("{:0{}}", 1, 3), "001");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:{2}}"sv, -5, 8, 16), " -5");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{{{:*^{1}}}}", 1, 3), "{*1*}");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:0{}}", 1, 3), "001");
|
||||
}
|
||||
|
||||
TEST_CASE(replacement_field_regression)
|
||||
{
|
||||
// FIXME: Compiletime check bypass: cannot parse '}}' correctly.
|
||||
EXPECT_EQ(String::formatted("{:{}}"sv, "", static_cast<unsigned long>(6)), " ");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:{}}"sv, "", static_cast<unsigned long>(6)), " ");
|
||||
}
|
||||
|
||||
TEST_CASE(complex_string_specifiers)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{:.8}", "123456789"), "12345678");
|
||||
EXPECT_EQ(String::formatted("{:9}", "abcd"), "abcd ");
|
||||
EXPECT_EQ(String::formatted("{:>9}", "abcd"), " abcd");
|
||||
EXPECT_EQ(String::formatted("{:^9}", "abcd"), " abcd ");
|
||||
EXPECT_EQ(String::formatted("{:4.6}", "a"), "a ");
|
||||
EXPECT_EQ(String::formatted("{:4.6}", "abcdef"), "abcdef");
|
||||
EXPECT_EQ(String::formatted("{:4.6}", "abcdefghi"), "abcdef");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:.8}", "123456789"), "12345678");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:9}", "abcd"), "abcd ");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:>9}", "abcd"), " abcd");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:^9}", "abcd"), " abcd ");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:4.6}", "a"), "a ");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:4.6}", "abcdef"), "abcdef");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:4.6}", "abcdefghi"), "abcdef");
|
||||
}
|
||||
|
||||
TEST_CASE(cast_integer_to_character)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{:c}", static_cast<int>('a')), "a");
|
||||
EXPECT_EQ(String::formatted("{:c}", static_cast<unsigned int>('f')), "f");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:c}", static_cast<int>('a')), "a");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:c}", static_cast<unsigned int>('f')), "f");
|
||||
}
|
||||
|
||||
TEST_CASE(boolean_values)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{}", true), "true");
|
||||
EXPECT_EQ(String::formatted("{}", false), "false");
|
||||
EXPECT_EQ(String::formatted("{:6}", true), "true ");
|
||||
EXPECT_EQ(String::formatted("{:>4}", false), "false");
|
||||
EXPECT_EQ(String::formatted("{:d}", false), "0");
|
||||
EXPECT_EQ(String::formatted("{:d}", true), "1");
|
||||
EXPECT_EQ(String::formatted("{:#08x}", true), "0x00000001");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", true), "true");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", false), "false");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:6}", true), "true ");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:>4}", false), "false");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:d}", false), "0");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:d}", true), "1");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:#08x}", true), "0x00000001");
|
||||
}
|
||||
|
||||
TEST_CASE(pointers)
|
||||
|
|
@ -155,13 +155,13 @@ TEST_CASE(pointers)
|
|||
void* ptr = reinterpret_cast<void*>(0x4000);
|
||||
|
||||
if (sizeof(void*) == 4) {
|
||||
EXPECT_EQ(String::formatted("{:p}", 32), "0x00000020");
|
||||
EXPECT_EQ(String::formatted("{:p}", ptr), "0x00004000");
|
||||
EXPECT_EQ(String::formatted("{}", ptr), "0x00004000");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:p}", 32), "0x00000020");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:p}", ptr), "0x00004000");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", ptr), "0x00004000");
|
||||
} else if (sizeof(void*) == 8) {
|
||||
EXPECT_EQ(String::formatted("{:p}", 32), "0x0000000000000020");
|
||||
EXPECT_EQ(String::formatted("{:p}", ptr), "0x0000000000004000");
|
||||
EXPECT_EQ(String::formatted("{}", ptr), "0x0000000000004000");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:p}", 32), "0x0000000000000020");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:p}", ptr), "0x0000000000004000");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", ptr), "0x0000000000004000");
|
||||
} else {
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
|
|
@ -173,12 +173,12 @@ TEST_CASE(pointers)
|
|||
// This is a bit scary, thus this test. At least this test should fail in this case.
|
||||
TEST_CASE(ensure_that_format_works)
|
||||
{
|
||||
if (String::formatted("FAIL") != "FAIL") {
|
||||
if (DeprecatedString::formatted("FAIL") != "FAIL") {
|
||||
fprintf(stderr, "FAIL\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (String::formatted("{} FAIL {}", 1, 2) != "1 FAIL 2") {
|
||||
if (DeprecatedString::formatted("{} FAIL {}", 1, 2) != "1 FAIL 2") {
|
||||
fprintf(stderr, "FAIL\n");
|
||||
exit(1);
|
||||
}
|
||||
|
|
@ -187,13 +187,13 @@ TEST_CASE(ensure_that_format_works)
|
|||
TEST_CASE(format_string_literal_as_pointer)
|
||||
{
|
||||
char const* literal = "abc";
|
||||
EXPECT_EQ(String::formatted("{:p}", literal), String::formatted("{:p}", reinterpret_cast<FlatPtr>(literal)));
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:p}", literal), DeprecatedString::formatted("{:p}", reinterpret_cast<FlatPtr>(literal)));
|
||||
}
|
||||
|
||||
TEST_CASE(format_character)
|
||||
{
|
||||
char a = 'a';
|
||||
EXPECT_EQ(String::formatted("{}", true ? a : 'b'), "a");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", true ? a : 'b'), "a");
|
||||
}
|
||||
|
||||
struct A {
|
||||
|
|
@ -210,8 +210,8 @@ struct AK::Formatter<B> : Formatter<StringView> {
|
|||
|
||||
TEST_CASE(format_if_supported)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{}", FormatIfSupported { A {} }), "?");
|
||||
EXPECT_EQ(String::formatted("{}", FormatIfSupported { B {} }), "B");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", FormatIfSupported { A {} }), "?");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", FormatIfSupported { B {} }), "B");
|
||||
}
|
||||
|
||||
TEST_CASE(file_descriptor)
|
||||
|
|
@ -239,46 +239,46 @@ TEST_CASE(file_descriptor)
|
|||
|
||||
TEST_CASE(floating_point_numbers)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{}", 1.12), "1.12");
|
||||
EXPECT_EQ(String::formatted("{}", 1.), "1");
|
||||
EXPECT_EQ(String::formatted("{:.3}", 1.12), "1.12");
|
||||
EXPECT_EQ(String::formatted("{:.1}", 1.12), "1.1");
|
||||
EXPECT_EQ(String::formatted("{}", -1.12), "-1.12");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", 1.12), "1.12");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", 1.), "1");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:.3}", 1.12), "1.12");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:.1}", 1.12), "1.1");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", -1.12), "-1.12");
|
||||
|
||||
EXPECT_EQ(String::formatted("{}", NAN), "nan");
|
||||
EXPECT_EQ(String::formatted("{}", INFINITY), "inf");
|
||||
EXPECT_EQ(String::formatted("{}", -INFINITY), "-inf");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", NAN), "nan");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", INFINITY), "inf");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", -INFINITY), "-inf");
|
||||
|
||||
// FIXME: There is always the question what we mean with the width field. Do we mean significant digits?
|
||||
// Do we mean the whole width? This is what was the simplest to implement:
|
||||
EXPECT_EQ(String::formatted("{:x>5.1}", 1.12), "xx1.1");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:x>5.1}", 1.12), "xx1.1");
|
||||
}
|
||||
|
||||
TEST_CASE(no_precision_no_trailing_number)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{:.0}", 0.1), "0");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:.0}", 0.1), "0");
|
||||
}
|
||||
|
||||
TEST_CASE(yay_this_implementation_sucks)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{:.0}", .99999999999), "0");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:.0}", .99999999999), "0");
|
||||
}
|
||||
|
||||
TEST_CASE(precision_with_trailing_zeros)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{:0.3}", 1.12), "1.120");
|
||||
EXPECT_EQ(String::formatted("{:0.1}", 1.12), "1.1");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:0.3}", 1.12), "1.120");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:0.1}", 1.12), "1.1");
|
||||
}
|
||||
|
||||
TEST_CASE(magnitude_less_than_zero)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{}", -0.654), "-0.654");
|
||||
EXPECT_EQ(String::formatted("{}", 0.654), "0.654");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", -0.654), "-0.654");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", 0.654), "0.654");
|
||||
}
|
||||
|
||||
TEST_CASE(format_nullptr)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{}", nullptr), String::formatted("{:p}", static_cast<FlatPtr>(0)));
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", nullptr), DeprecatedString::formatted("{:p}", static_cast<FlatPtr>(0)));
|
||||
}
|
||||
|
||||
struct C {
|
||||
|
|
@ -294,12 +294,12 @@ struct AK::Formatter<C> : AK::Formatter<FormatString> {
|
|||
|
||||
TEST_CASE(use_format_string_formatter)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{:*<10}", C { 42 }), "C(i=42)***");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:*<10}", C { 42 }), "C(i=42)***");
|
||||
}
|
||||
|
||||
TEST_CASE(long_long_regression)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{}", 0x0123456789abcdefLL), "81985529216486895");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", 0x0123456789abcdefLL), "81985529216486895");
|
||||
|
||||
StringBuilder builder;
|
||||
AK::FormatBuilder fmtbuilder { builder };
|
||||
|
|
@ -310,38 +310,38 @@ TEST_CASE(long_long_regression)
|
|||
|
||||
TEST_CASE(hex_dump)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{:hex-dump}", "0000"), "30303030");
|
||||
EXPECT_EQ(String::formatted("{:>4hex-dump}", "0000"), "30303030 0000");
|
||||
EXPECT_EQ(String::formatted("{:>2hex-dump}", "0000"), "3030 00\n3030 00");
|
||||
EXPECT_EQ(String::formatted("{:*>4hex-dump}", "0000"), "30303030****0000");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:hex-dump}", "0000"), "30303030");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:>4hex-dump}", "0000"), "30303030 0000");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:>2hex-dump}", "0000"), "3030 00\n3030 00");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:*>4hex-dump}", "0000"), "30303030****0000");
|
||||
}
|
||||
|
||||
TEST_CASE(vector_format)
|
||||
{
|
||||
{
|
||||
Vector<int> v { 1, 2, 3, 4 };
|
||||
EXPECT_EQ(String::formatted("{}", v), "[ 1, 2, 3, 4 ]");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", v), "[ 1, 2, 3, 4 ]");
|
||||
}
|
||||
{
|
||||
Vector<StringView> v { "1"sv, "2"sv, "3"sv, "4"sv };
|
||||
EXPECT_EQ(String::formatted("{}", v), "[ 1, 2, 3, 4 ]");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", v), "[ 1, 2, 3, 4 ]");
|
||||
}
|
||||
{
|
||||
Vector<Vector<String>> v { { "1"sv, "2"sv }, { "3"sv, "4"sv } };
|
||||
EXPECT_EQ(String::formatted("{}", v), "[ [ 1, 2 ], [ 3, 4 ] ]");
|
||||
Vector<Vector<DeprecatedString>> v { { "1"sv, "2"sv }, { "3"sv, "4"sv } };
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", v), "[ [ 1, 2 ], [ 3, 4 ] ]");
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE(format_wchar)
|
||||
{
|
||||
EXPECT_EQ(String::formatted("{}", L'a'), "a");
|
||||
EXPECT_EQ(String::formatted("{}", L'\U0001F41E'), "\xF0\x9F\x90\x9E");
|
||||
EXPECT_EQ(String::formatted("{:x}", L'a'), "61");
|
||||
EXPECT_EQ(String::formatted("{:x}", L'\U0001F41E'), "1f41e");
|
||||
EXPECT_EQ(String::formatted("{:d}", L'a'), "97");
|
||||
EXPECT_EQ(String::formatted("{:d}", L'\U0001F41E'), "128030");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", L'a'), "a");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{}", L'\U0001F41E'), "\xF0\x9F\x90\x9E");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:x}", L'a'), "61");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:x}", L'\U0001F41E'), "1f41e");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:d}", L'a'), "97");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:d}", L'\U0001F41E'), "128030");
|
||||
|
||||
EXPECT_EQ(String::formatted("{:6}", L'a'), "a ");
|
||||
EXPECT_EQ(String::formatted("{:6d}", L'a'), " 97");
|
||||
EXPECT_EQ(String::formatted("{:#x}", L'\U0001F41E'), "0x1f41e");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:6}", L'a'), "a ");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:6d}", L'a'), " 97");
|
||||
EXPECT_EQ(DeprecatedString::formatted("{:#x}", L'\U0001F41E'), "0x1f41e");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/HashMap.h>
|
||||
#include <AK/OwnPtr.h>
|
||||
#include <AK/String.h>
|
||||
|
||||
TEST_CASE(construct)
|
||||
{
|
||||
|
|
@ -19,7 +19,7 @@ TEST_CASE(construct)
|
|||
|
||||
TEST_CASE(construct_from_initializer_list)
|
||||
{
|
||||
HashMap<int, String> number_to_string {
|
||||
HashMap<int, DeprecatedString> number_to_string {
|
||||
{ 1, "One" },
|
||||
{ 2, "Two" },
|
||||
{ 3, "Three" },
|
||||
|
|
@ -30,7 +30,7 @@ TEST_CASE(construct_from_initializer_list)
|
|||
|
||||
TEST_CASE(populate)
|
||||
{
|
||||
HashMap<int, String> number_to_string;
|
||||
HashMap<int, DeprecatedString> number_to_string;
|
||||
number_to_string.set(1, "One");
|
||||
number_to_string.set(2, "Two");
|
||||
number_to_string.set(3, "Three");
|
||||
|
|
@ -41,7 +41,7 @@ TEST_CASE(populate)
|
|||
|
||||
TEST_CASE(range_loop)
|
||||
{
|
||||
HashMap<int, String> number_to_string;
|
||||
HashMap<int, DeprecatedString> number_to_string;
|
||||
EXPECT_EQ(number_to_string.set(1, "One"), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(number_to_string.set(2, "Two"), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(number_to_string.set(3, "Three"), AK::HashSetResult::InsertedNewEntry);
|
||||
|
|
@ -56,7 +56,7 @@ TEST_CASE(range_loop)
|
|||
|
||||
TEST_CASE(map_remove)
|
||||
{
|
||||
HashMap<int, String> number_to_string;
|
||||
HashMap<int, DeprecatedString> number_to_string;
|
||||
EXPECT_EQ(number_to_string.set(1, "One"), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(number_to_string.set(2, "Two"), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(number_to_string.set(3, "Three"), AK::HashSetResult::InsertedNewEntry);
|
||||
|
|
@ -73,7 +73,7 @@ TEST_CASE(map_remove)
|
|||
|
||||
TEST_CASE(remove_all_matching)
|
||||
{
|
||||
HashMap<int, String> map;
|
||||
HashMap<int, DeprecatedString> map;
|
||||
|
||||
map.set(1, "One");
|
||||
map.set(2, "Two");
|
||||
|
|
@ -82,27 +82,27 @@ TEST_CASE(remove_all_matching)
|
|||
|
||||
EXPECT_EQ(map.size(), 4u);
|
||||
|
||||
EXPECT_EQ(map.remove_all_matching([&](int key, String const& value) { return key == 1 || value == "Two"; }), true);
|
||||
EXPECT_EQ(map.remove_all_matching([&](int key, DeprecatedString const& value) { return key == 1 || value == "Two"; }), true);
|
||||
EXPECT_EQ(map.size(), 2u);
|
||||
|
||||
EXPECT_EQ(map.remove_all_matching([&](int, String const&) { return false; }), false);
|
||||
EXPECT_EQ(map.remove_all_matching([&](int, DeprecatedString const&) { return false; }), false);
|
||||
EXPECT_EQ(map.size(), 2u);
|
||||
|
||||
EXPECT(map.contains(3));
|
||||
EXPECT(map.contains(4));
|
||||
|
||||
EXPECT_EQ(map.remove_all_matching([&](int, String const&) { return true; }), true);
|
||||
EXPECT_EQ(map.remove_all_matching([&](int, String const&) { return false; }), false);
|
||||
EXPECT_EQ(map.remove_all_matching([&](int, DeprecatedString const&) { return true; }), true);
|
||||
EXPECT_EQ(map.remove_all_matching([&](int, DeprecatedString const&) { return false; }), false);
|
||||
|
||||
EXPECT(map.is_empty());
|
||||
|
||||
EXPECT_EQ(map.remove_all_matching([&](int, String const&) { return true; }), false);
|
||||
EXPECT_EQ(map.remove_all_matching([&](int, DeprecatedString const&) { return true; }), false);
|
||||
}
|
||||
|
||||
TEST_CASE(case_insensitive)
|
||||
{
|
||||
HashMap<String, int, CaseInsensitiveStringTraits> casemap;
|
||||
EXPECT_EQ(String("nickserv").to_lowercase(), String("NickServ").to_lowercase());
|
||||
HashMap<DeprecatedString, int, CaseInsensitiveStringTraits> casemap;
|
||||
EXPECT_EQ(DeprecatedString("nickserv").to_lowercase(), DeprecatedString("NickServ").to_lowercase());
|
||||
EXPECT_EQ(casemap.set("nickserv", 3), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(casemap.set("NickServ", 3), AK::HashSetResult::ReplacedExistingEntry);
|
||||
EXPECT_EQ(casemap.size(), 1u);
|
||||
|
|
@ -111,11 +111,11 @@ TEST_CASE(case_insensitive)
|
|||
TEST_CASE(hashmap_of_nonnullownptr_get)
|
||||
{
|
||||
struct Object {
|
||||
Object(String const& s)
|
||||
Object(DeprecatedString const& s)
|
||||
: string(s)
|
||||
{
|
||||
}
|
||||
String string;
|
||||
DeprecatedString string;
|
||||
};
|
||||
|
||||
HashMap<int, NonnullOwnPtr<Object>> objects;
|
||||
|
|
@ -142,16 +142,16 @@ TEST_CASE(hashmap_of_nonnullownptr_get)
|
|||
|
||||
TEST_CASE(many_strings)
|
||||
{
|
||||
HashMap<String, int> strings;
|
||||
HashMap<DeprecatedString, int> strings;
|
||||
for (int i = 0; i < 999; ++i) {
|
||||
EXPECT_EQ(strings.set(String::number(i), i), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(strings.set(DeprecatedString::number(i), i), AK::HashSetResult::InsertedNewEntry);
|
||||
}
|
||||
EXPECT_EQ(strings.size(), 999u);
|
||||
for (auto& it : strings) {
|
||||
EXPECT_EQ(it.key.to_int().value(), it.value);
|
||||
}
|
||||
for (int i = 0; i < 999; ++i) {
|
||||
EXPECT_EQ(strings.remove(String::number(i)), true);
|
||||
EXPECT_EQ(strings.remove(DeprecatedString::number(i)), true);
|
||||
}
|
||||
EXPECT_EQ(strings.is_empty(), true);
|
||||
}
|
||||
|
|
@ -204,7 +204,7 @@ TEST_CASE(basic_contains)
|
|||
|
||||
TEST_CASE(in_place_rehashing_ordered_loop_bug)
|
||||
{
|
||||
OrderedHashMap<String, String> map;
|
||||
OrderedHashMap<DeprecatedString, DeprecatedString> map;
|
||||
map.set("yt.innertube::nextId", "");
|
||||
map.set("yt.innertube::requests", "");
|
||||
map.remove("yt.innertube::nextId");
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/HashTable.h>
|
||||
#include <AK/NonnullOwnPtr.h>
|
||||
#include <AK/String.h>
|
||||
|
||||
TEST_CASE(construct)
|
||||
{
|
||||
|
|
@ -44,7 +44,7 @@ TEST_CASE(move_is_not_swap)
|
|||
|
||||
TEST_CASE(populate)
|
||||
{
|
||||
HashTable<String> strings;
|
||||
HashTable<DeprecatedString> strings;
|
||||
strings.set("One");
|
||||
strings.set("Two");
|
||||
strings.set("Three");
|
||||
|
|
@ -55,7 +55,7 @@ TEST_CASE(populate)
|
|||
|
||||
TEST_CASE(range_loop)
|
||||
{
|
||||
HashTable<String> strings;
|
||||
HashTable<DeprecatedString> strings;
|
||||
EXPECT_EQ(strings.set("One"), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(strings.set("Two"), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(strings.set("Three"), AK::HashSetResult::InsertedNewEntry);
|
||||
|
|
@ -70,7 +70,7 @@ TEST_CASE(range_loop)
|
|||
|
||||
TEST_CASE(table_remove)
|
||||
{
|
||||
HashTable<String> strings;
|
||||
HashTable<DeprecatedString> strings;
|
||||
EXPECT_EQ(strings.set("One"), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(strings.set("Two"), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(strings.set("Three"), AK::HashSetResult::InsertedNewEntry);
|
||||
|
|
@ -113,8 +113,8 @@ TEST_CASE(remove_all_matching)
|
|||
|
||||
TEST_CASE(case_insensitive)
|
||||
{
|
||||
HashTable<String, CaseInsensitiveStringTraits> casetable;
|
||||
EXPECT_EQ(String("nickserv").to_lowercase(), String("NickServ").to_lowercase());
|
||||
HashTable<DeprecatedString, CaseInsensitiveStringTraits> casetable;
|
||||
EXPECT_EQ(DeprecatedString("nickserv").to_lowercase(), DeprecatedString("NickServ").to_lowercase());
|
||||
EXPECT_EQ(casetable.set("nickserv"), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(casetable.set("NickServ"), AK::HashSetResult::ReplacedExistingEntry);
|
||||
EXPECT_EQ(casetable.size(), 1u);
|
||||
|
|
@ -122,33 +122,33 @@ TEST_CASE(case_insensitive)
|
|||
|
||||
TEST_CASE(many_strings)
|
||||
{
|
||||
HashTable<String> strings;
|
||||
HashTable<DeprecatedString> strings;
|
||||
for (int i = 0; i < 999; ++i) {
|
||||
EXPECT_EQ(strings.set(String::number(i)), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(strings.set(DeprecatedString::number(i)), AK::HashSetResult::InsertedNewEntry);
|
||||
}
|
||||
EXPECT_EQ(strings.size(), 999u);
|
||||
for (int i = 0; i < 999; ++i) {
|
||||
EXPECT_EQ(strings.remove(String::number(i)), true);
|
||||
EXPECT_EQ(strings.remove(DeprecatedString::number(i)), true);
|
||||
}
|
||||
EXPECT_EQ(strings.is_empty(), true);
|
||||
}
|
||||
|
||||
TEST_CASE(many_collisions)
|
||||
{
|
||||
struct StringCollisionTraits : public GenericTraits<String> {
|
||||
static unsigned hash(String const&) { return 0; }
|
||||
struct StringCollisionTraits : public GenericTraits<DeprecatedString> {
|
||||
static unsigned hash(DeprecatedString const&) { return 0; }
|
||||
};
|
||||
|
||||
HashTable<String, StringCollisionTraits> strings;
|
||||
HashTable<DeprecatedString, StringCollisionTraits> strings;
|
||||
for (int i = 0; i < 999; ++i) {
|
||||
EXPECT_EQ(strings.set(String::number(i)), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(strings.set(DeprecatedString::number(i)), AK::HashSetResult::InsertedNewEntry);
|
||||
}
|
||||
|
||||
EXPECT_EQ(strings.set("foo"), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(strings.size(), 1000u);
|
||||
|
||||
for (int i = 0; i < 999; ++i) {
|
||||
EXPECT_EQ(strings.remove(String::number(i)), true);
|
||||
EXPECT_EQ(strings.remove(DeprecatedString::number(i)), true);
|
||||
}
|
||||
|
||||
// FIXME: Doing this with an "EXPECT_NOT_EQ" would be cleaner.
|
||||
|
|
@ -157,24 +157,24 @@ TEST_CASE(many_collisions)
|
|||
|
||||
TEST_CASE(space_reuse)
|
||||
{
|
||||
struct StringCollisionTraits : public GenericTraits<String> {
|
||||
static unsigned hash(String const&) { return 0; }
|
||||
struct StringCollisionTraits : public GenericTraits<DeprecatedString> {
|
||||
static unsigned hash(DeprecatedString const&) { return 0; }
|
||||
};
|
||||
|
||||
HashTable<String, StringCollisionTraits> strings;
|
||||
HashTable<DeprecatedString, StringCollisionTraits> strings;
|
||||
|
||||
// Add a few items to allow it to do initial resizing.
|
||||
EXPECT_EQ(strings.set("0"), AK::HashSetResult::InsertedNewEntry);
|
||||
for (int i = 1; i < 5; ++i) {
|
||||
EXPECT_EQ(strings.set(String::number(i)), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(strings.remove(String::number(i - 1)), true);
|
||||
EXPECT_EQ(strings.set(DeprecatedString::number(i)), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(strings.remove(DeprecatedString::number(i - 1)), true);
|
||||
}
|
||||
|
||||
auto capacity = strings.capacity();
|
||||
|
||||
for (int i = 5; i < 999; ++i) {
|
||||
EXPECT_EQ(strings.set(String::number(i)), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(strings.remove(String::number(i - 1)), true);
|
||||
EXPECT_EQ(strings.set(DeprecatedString::number(i)), AK::HashSetResult::InsertedNewEntry);
|
||||
EXPECT_EQ(strings.remove(DeprecatedString::number(i - 1)), true);
|
||||
}
|
||||
|
||||
EXPECT_EQ(strings.capacity(), capacity);
|
||||
|
|
@ -300,7 +300,7 @@ BENCHMARK_CASE(benchmark_thrashing)
|
|||
|
||||
TEST_CASE(reinsertion)
|
||||
{
|
||||
OrderedHashTable<String> map;
|
||||
OrderedHashTable<DeprecatedString> map;
|
||||
map.set("ytidb::LAST_RESULT_ENTRY_KEY");
|
||||
map.set("__sak");
|
||||
map.remove("__sak");
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@
|
|||
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/HashMap.h>
|
||||
#include <AK/JsonObject.h>
|
||||
#include <AK/JsonValue.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/StringBuilder.h>
|
||||
|
||||
TEST_CASE(load_form)
|
||||
{
|
||||
String raw_form_json = R"(
|
||||
DeprecatedString raw_form_json = R"(
|
||||
{
|
||||
"name": "Form1",
|
||||
"widgets": [
|
||||
|
|
@ -294,7 +294,7 @@ private:
|
|||
|
||||
TEST_CASE(fallible_json_object_for_each)
|
||||
{
|
||||
String raw_json = R"(
|
||||
DeprecatedString raw_json = R"(
|
||||
{
|
||||
"name": "anon",
|
||||
"home": "/home/anon",
|
||||
|
|
@ -334,7 +334,7 @@ TEST_CASE(fallible_json_object_for_each)
|
|||
|
||||
TEST_CASE(fallible_json_array_for_each)
|
||||
{
|
||||
String raw_json = R"(
|
||||
DeprecatedString raw_json = R"(
|
||||
[
|
||||
"anon",
|
||||
"/home/anon",
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/LexicalPath.h>
|
||||
#include <AK/String.h>
|
||||
|
||||
TEST_CASE(relative_path)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/MemMem.h>
|
||||
#include <AK/Memory.h>
|
||||
#include <AK/String.h>
|
||||
|
||||
TEST_CASE(bitap)
|
||||
{
|
||||
|
|
@ -78,9 +78,9 @@ TEST_CASE(kmp_two_chunks)
|
|||
|
||||
TEST_CASE(timing_safe_compare)
|
||||
{
|
||||
String data_set = "abcdefghijklmnopqrstuvwxyz123456789";
|
||||
DeprecatedString data_set = "abcdefghijklmnopqrstuvwxyz123456789";
|
||||
EXPECT_EQ(true, AK::timing_safe_compare(data_set.characters(), data_set.characters(), data_set.length()));
|
||||
|
||||
String reversed = data_set.reverse();
|
||||
DeprecatedString reversed = data_set.reverse();
|
||||
EXPECT_EQ(false, AK::timing_safe_compare(data_set.characters(), reversed.characters(), reversed.length()));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/NonnullRefPtr.h>
|
||||
#include <AK/String.h>
|
||||
|
||||
struct Object : public RefCounted<Object> {
|
||||
int x;
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/Optional.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/Vector.h>
|
||||
|
||||
TEST_CASE(basic_optional)
|
||||
|
|
@ -59,7 +59,7 @@ TEST_CASE(optional_rvalue_ref_qualified_getters)
|
|||
TEST_CASE(optional_leak_1)
|
||||
{
|
||||
struct Structure {
|
||||
Optional<String> str;
|
||||
Optional<DeprecatedString> str;
|
||||
};
|
||||
|
||||
// This used to leak, it does not anymore.
|
||||
|
|
@ -81,7 +81,7 @@ TEST_CASE(comparison_without_values)
|
|||
{
|
||||
Optional<StringView> opt0;
|
||||
Optional<StringView> opt1;
|
||||
Optional<String> opt2;
|
||||
Optional<DeprecatedString> opt2;
|
||||
EXPECT_EQ(opt0, opt1);
|
||||
EXPECT_EQ(opt0, opt2);
|
||||
}
|
||||
|
|
@ -90,7 +90,7 @@ TEST_CASE(comparison_with_values)
|
|||
{
|
||||
Optional<StringView> opt0;
|
||||
Optional<StringView> opt1 = "foo"sv;
|
||||
Optional<String> opt2 = "foo"sv;
|
||||
Optional<DeprecatedString> opt2 = "foo"sv;
|
||||
Optional<StringView> opt3 = "bar"sv;
|
||||
EXPECT_NE(opt0, opt1);
|
||||
EXPECT_EQ(opt1, opt2);
|
||||
|
|
@ -99,14 +99,14 @@ TEST_CASE(comparison_with_values)
|
|||
|
||||
TEST_CASE(comparison_to_underlying_types)
|
||||
{
|
||||
Optional<String> opt0;
|
||||
EXPECT_NE(opt0, String());
|
||||
Optional<DeprecatedString> opt0;
|
||||
EXPECT_NE(opt0, DeprecatedString());
|
||||
EXPECT_NE(opt0, "foo");
|
||||
|
||||
Optional<StringView> opt1 = "foo"sv;
|
||||
EXPECT_EQ(opt1, "foo");
|
||||
EXPECT_NE(opt1, "bar");
|
||||
EXPECT_EQ(opt1, String("foo"));
|
||||
EXPECT_EQ(opt1, DeprecatedString("foo"));
|
||||
}
|
||||
|
||||
TEST_CASE(comparison_with_numeric_types)
|
||||
|
|
@ -262,7 +262,7 @@ TEST_CASE(comparison_reference)
|
|||
StringView test = "foo"sv;
|
||||
Optional<StringView&> opt0;
|
||||
Optional<StringView const&> opt1 = test;
|
||||
Optional<String> opt2 = "foo"sv;
|
||||
Optional<DeprecatedString> opt2 = "foo"sv;
|
||||
Optional<StringView> opt3 = "bar"sv;
|
||||
|
||||
EXPECT_NE(opt0, opt1);
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/Queue.h>
|
||||
#include <AK/String.h>
|
||||
|
||||
TEST_CASE(construct)
|
||||
{
|
||||
|
|
@ -32,7 +32,7 @@ TEST_CASE(populate_int)
|
|||
|
||||
TEST_CASE(populate_string)
|
||||
{
|
||||
Queue<String> strings;
|
||||
Queue<DeprecatedString> strings;
|
||||
strings.enqueue("ABC");
|
||||
strings.enqueue("DEF");
|
||||
EXPECT_EQ(strings.size(), 2u);
|
||||
|
|
@ -43,11 +43,11 @@ TEST_CASE(populate_string)
|
|||
|
||||
TEST_CASE(order)
|
||||
{
|
||||
Queue<String> strings;
|
||||
Queue<DeprecatedString> strings;
|
||||
EXPECT(strings.is_empty());
|
||||
|
||||
for (size_t i = 0; i < 10000; ++i) {
|
||||
strings.enqueue(String::number(i));
|
||||
strings.enqueue(DeprecatedString::number(i));
|
||||
EXPECT_EQ(strings.size(), i + 1);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/NonnullRefPtr.h>
|
||||
#include <AK/String.h>
|
||||
|
||||
struct Object : public RefCounted<Object> {
|
||||
int x;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ TEST_CASE(basic)
|
|||
|
||||
TEST_CASE(complex_type)
|
||||
{
|
||||
AK::Stack<String, 4> stack;
|
||||
AK::Stack<DeprecatedString, 4> stack;
|
||||
|
||||
EXPECT_EQ(stack.is_empty(), true);
|
||||
EXPECT(stack.push("Well"));
|
||||
|
|
|
|||
|
|
@ -282,7 +282,7 @@ TEST_CASE(convert_to_uint_from_octal)
|
|||
|
||||
TEST_CASE(ends_with)
|
||||
{
|
||||
String test_string = "ABCDEF";
|
||||
DeprecatedString test_string = "ABCDEF";
|
||||
EXPECT(AK::StringUtils::ends_with(test_string, "DEF"sv, CaseSensitivity::CaseSensitive));
|
||||
EXPECT(AK::StringUtils::ends_with(test_string, "ABCDEF"sv, CaseSensitivity::CaseSensitive));
|
||||
EXPECT(!AK::StringUtils::ends_with(test_string, "ABCDE"sv, CaseSensitivity::CaseSensitive));
|
||||
|
|
@ -293,7 +293,7 @@ TEST_CASE(ends_with)
|
|||
|
||||
TEST_CASE(starts_with)
|
||||
{
|
||||
String test_string = "ABCDEF";
|
||||
DeprecatedString test_string = "ABCDEF";
|
||||
EXPECT(AK::StringUtils::starts_with(test_string, "ABC"sv, CaseSensitivity::CaseSensitive));
|
||||
EXPECT(AK::StringUtils::starts_with(test_string, "ABCDEF"sv, CaseSensitivity::CaseSensitive));
|
||||
EXPECT(!AK::StringUtils::starts_with(test_string, "BCDEF"sv, CaseSensitivity::CaseSensitive));
|
||||
|
|
@ -304,7 +304,7 @@ TEST_CASE(starts_with)
|
|||
|
||||
TEST_CASE(contains)
|
||||
{
|
||||
String test_string = "ABCDEFABCXYZ";
|
||||
DeprecatedString test_string = "ABCDEFABCXYZ";
|
||||
EXPECT(AK::StringUtils::contains(test_string, "ABC"sv, CaseSensitivity::CaseSensitive));
|
||||
EXPECT(AK::StringUtils::contains(test_string, "ABC"sv, CaseSensitivity::CaseInsensitive));
|
||||
EXPECT(AK::StringUtils::contains(test_string, "AbC"sv, CaseSensitivity::CaseInsensitive));
|
||||
|
|
@ -322,7 +322,7 @@ TEST_CASE(contains)
|
|||
EXPECT(!AK::StringUtils::contains(test_string, "L"sv, CaseSensitivity::CaseSensitive));
|
||||
EXPECT(!AK::StringUtils::contains(test_string, "L"sv, CaseSensitivity::CaseInsensitive));
|
||||
|
||||
String command_palette_bug_string = "Go Go Back";
|
||||
DeprecatedString command_palette_bug_string = "Go Go Back";
|
||||
EXPECT(AK::StringUtils::contains(command_palette_bug_string, "Go Back"sv, AK::CaseSensitivity::CaseSensitive));
|
||||
EXPECT(AK::StringUtils::contains(command_palette_bug_string, "gO bAcK"sv, AK::CaseSensitivity::CaseInsensitive));
|
||||
}
|
||||
|
|
@ -351,7 +351,7 @@ TEST_CASE(trim)
|
|||
|
||||
TEST_CASE(find)
|
||||
{
|
||||
String test_string = "1234567";
|
||||
DeprecatedString test_string = "1234567";
|
||||
EXPECT_EQ(AK::StringUtils::find(test_string, "1"sv).value_or(1), 0u);
|
||||
EXPECT_EQ(AK::StringUtils::find(test_string, "2"sv).value_or(2), 1u);
|
||||
EXPECT_EQ(AK::StringUtils::find(test_string, "3"sv).value_or(3), 2u);
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/String.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/Vector.h>
|
||||
|
||||
TEST_CASE(construct_empty)
|
||||
|
|
@ -29,8 +29,8 @@ TEST_CASE(view_literal)
|
|||
|
||||
TEST_CASE(compare_views)
|
||||
{
|
||||
String foo1 = "foo";
|
||||
String foo2 = "foo";
|
||||
DeprecatedString foo1 = "foo";
|
||||
DeprecatedString foo2 = "foo";
|
||||
auto view1 = foo1.view();
|
||||
auto view2 = foo2.view();
|
||||
|
||||
|
|
@ -43,7 +43,7 @@ TEST_CASE(compare_views)
|
|||
TEST_CASE(string_view_literal_operator)
|
||||
{
|
||||
StringView literal_view = "foo"sv;
|
||||
String test_string = "foo";
|
||||
DeprecatedString test_string = "foo";
|
||||
|
||||
EXPECT_EQ(literal_view.length(), test_string.length());
|
||||
EXPECT_EQ(literal_view, test_string);
|
||||
|
|
@ -51,7 +51,7 @@ TEST_CASE(string_view_literal_operator)
|
|||
|
||||
TEST_CASE(starts_with)
|
||||
{
|
||||
String test_string = "ABCDEF";
|
||||
DeprecatedString test_string = "ABCDEF";
|
||||
StringView test_string_view = test_string.view();
|
||||
EXPECT(test_string_view.starts_with('A'));
|
||||
EXPECT(!test_string_view.starts_with('B'));
|
||||
|
|
@ -64,7 +64,7 @@ TEST_CASE(starts_with)
|
|||
|
||||
TEST_CASE(ends_with)
|
||||
{
|
||||
String test_string = "ABCDEF";
|
||||
DeprecatedString test_string = "ABCDEF";
|
||||
StringView test_string_view = test_string.view();
|
||||
EXPECT(test_string_view.ends_with("DEF"sv));
|
||||
EXPECT(test_string_view.ends_with('F'));
|
||||
|
|
@ -78,23 +78,23 @@ TEST_CASE(ends_with)
|
|||
|
||||
TEST_CASE(lines)
|
||||
{
|
||||
String test_string = "a\rb\nc\r\nd";
|
||||
DeprecatedString test_string = "a\rb\nc\r\nd";
|
||||
StringView test_string_view = test_string.view();
|
||||
Vector<StringView> test_string_vector = test_string_view.lines();
|
||||
EXPECT_EQ(test_string_vector.size(), 4u);
|
||||
EXPECT(test_string_vector.at(0) == String("a"));
|
||||
EXPECT(test_string_vector.at(1) == String("b"));
|
||||
EXPECT(test_string_vector.at(2) == String("c"));
|
||||
EXPECT(test_string_vector.at(3) == String("d"));
|
||||
EXPECT(test_string_vector.at(0) == DeprecatedString("a"));
|
||||
EXPECT(test_string_vector.at(1) == DeprecatedString("b"));
|
||||
EXPECT(test_string_vector.at(2) == DeprecatedString("c"));
|
||||
EXPECT(test_string_vector.at(3) == DeprecatedString("d"));
|
||||
|
||||
test_string = "```\nHello there\r\nHello there\n```";
|
||||
test_string_view = test_string.view();
|
||||
test_string_vector = test_string_view.lines();
|
||||
EXPECT_EQ(test_string_vector.size(), 4u);
|
||||
EXPECT(test_string_vector.at(0) == String("```"));
|
||||
EXPECT(test_string_vector.at(1) == String("Hello there"));
|
||||
EXPECT(test_string_vector.at(2) == String("Hello there"));
|
||||
EXPECT(test_string_vector.at(3) == String("```"));
|
||||
EXPECT(test_string_vector.at(0) == DeprecatedString("```"));
|
||||
EXPECT(test_string_vector.at(1) == DeprecatedString("Hello there"));
|
||||
EXPECT(test_string_vector.at(2) == DeprecatedString("Hello there"));
|
||||
EXPECT(test_string_vector.at(3) == DeprecatedString("```"));
|
||||
|
||||
test_string = "\n\n\n";
|
||||
test_string_view = test_string.view();
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
TEST_CASE(normal_behavior)
|
||||
{
|
||||
Trie<char, String> dictionary('/', "");
|
||||
Trie<char, DeprecatedString> dictionary('/', "");
|
||||
constexpr StringView data[] { "test"sv, "example"sv, "foo"sv, "foobar"sv };
|
||||
constexpr size_t total_chars = 18; // root (1), 'test' (4), 'example' (7), 'foo' (3), 'foobar' (3, "foo" already stored).
|
||||
for (auto& view : data) {
|
||||
auto it = view.begin();
|
||||
MUST(dictionary.insert(it, view.end(), view, [](auto& parent, auto& it) -> Optional<String> { return String::formatted("{}{}", parent.metadata_value(), *it); }));
|
||||
MUST(dictionary.insert(it, view.end(), view, [](auto& parent, auto& it) -> Optional<DeprecatedString> { return DeprecatedString::formatted("{}{}", parent.metadata_value(), *it); }));
|
||||
}
|
||||
|
||||
size_t i = 0;
|
||||
|
|
|
|||
|
|
@ -10,41 +10,41 @@
|
|||
|
||||
TEST_CASE(basic)
|
||||
{
|
||||
Tuple<int, String> value { 1, "foo" };
|
||||
Tuple<int, DeprecatedString> value { 1, "foo" };
|
||||
EXPECT_EQ(value.get<int>(), 1);
|
||||
EXPECT_EQ(value.get<String>(), "foo");
|
||||
EXPECT_EQ(value.get<DeprecatedString>(), "foo");
|
||||
EXPECT_EQ(value.get<0>(), 1);
|
||||
EXPECT_EQ(value.get<1>(), "foo");
|
||||
|
||||
// Move assignment
|
||||
value = { 2, "bar" };
|
||||
EXPECT_EQ(value.get<int>(), 2);
|
||||
EXPECT_EQ(value.get<String>(), "bar");
|
||||
EXPECT_EQ(value.get<DeprecatedString>(), "bar");
|
||||
EXPECT_EQ(value.get<0>(), 2);
|
||||
EXPECT_EQ(value.get<1>(), "bar");
|
||||
|
||||
// Copy ctor
|
||||
auto other_value { value };
|
||||
EXPECT_EQ(other_value.get<int>(), 2);
|
||||
EXPECT_EQ(other_value.get<String>(), "bar");
|
||||
EXPECT_EQ(other_value.get<DeprecatedString>(), "bar");
|
||||
EXPECT_EQ(other_value.get<0>(), 2);
|
||||
EXPECT_EQ(other_value.get<1>(), "bar");
|
||||
|
||||
// Move ctor
|
||||
auto moved_to_value { move(value) };
|
||||
EXPECT_EQ(moved_to_value.get<int>(), 2);
|
||||
EXPECT_EQ(moved_to_value.get<String>(), "bar");
|
||||
EXPECT_EQ(moved_to_value.get<DeprecatedString>(), "bar");
|
||||
EXPECT_EQ(moved_to_value.get<0>(), 2);
|
||||
EXPECT_EQ(moved_to_value.get<1>(), "bar");
|
||||
|
||||
// Copy assignment
|
||||
value = moved_to_value;
|
||||
EXPECT_EQ(moved_to_value.get<int>(), 2);
|
||||
EXPECT_EQ(moved_to_value.get<String>(), "bar");
|
||||
EXPECT_EQ(moved_to_value.get<DeprecatedString>(), "bar");
|
||||
EXPECT_EQ(moved_to_value.get<0>(), 2);
|
||||
EXPECT_EQ(moved_to_value.get<1>(), "bar");
|
||||
EXPECT_EQ(value.get<int>(), 2);
|
||||
EXPECT_EQ(value.get<String>(), "bar");
|
||||
EXPECT_EQ(value.get<DeprecatedString>(), "bar");
|
||||
EXPECT_EQ(value.get<0>(), 2);
|
||||
EXPECT_EQ(value.get<1>(), "bar");
|
||||
}
|
||||
|
|
@ -68,12 +68,12 @@ TEST_CASE(no_copy)
|
|||
|
||||
TEST_CASE(apply)
|
||||
{
|
||||
Tuple<int, int, String> args { 1, 2, "foo" };
|
||||
Tuple<int, int, DeprecatedString> args { 1, 2, "foo" };
|
||||
|
||||
// With copy
|
||||
{
|
||||
bool was_called = false;
|
||||
args.apply_as_args([&](int a, int b, String c) {
|
||||
args.apply_as_args([&](int a, int b, DeprecatedString c) {
|
||||
was_called = true;
|
||||
EXPECT_EQ(a, 1);
|
||||
EXPECT_EQ(b, 2);
|
||||
|
|
@ -85,7 +85,7 @@ TEST_CASE(apply)
|
|||
// With reference
|
||||
{
|
||||
bool was_called = false;
|
||||
args.apply_as_args([&](int& a, int& b, String& c) {
|
||||
args.apply_as_args([&](int& a, int& b, DeprecatedString& c) {
|
||||
was_called = true;
|
||||
EXPECT_EQ(a, 1);
|
||||
EXPECT_EQ(b, 2);
|
||||
|
|
@ -98,7 +98,7 @@ TEST_CASE(apply)
|
|||
{
|
||||
bool was_called = false;
|
||||
auto const& args_ref = args;
|
||||
args_ref.apply_as_args([&](int const& a, int const& b, String const& c) {
|
||||
args_ref.apply_as_args([&](int const& a, int const& b, DeprecatedString const& c) {
|
||||
was_called = true;
|
||||
EXPECT_EQ(a, 1);
|
||||
EXPECT_EQ(b, 2);
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/Array.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/StringView.h>
|
||||
#include <AK/Types.h>
|
||||
#include <AK/Utf16View.h>
|
||||
|
|
@ -53,7 +53,7 @@ TEST_CASE(decode_utf8)
|
|||
TEST_CASE(encode_utf8)
|
||||
{
|
||||
{
|
||||
String utf8_string("Привет, мир! 😀 γειά σου κόσμος こんにちは世界");
|
||||
DeprecatedString utf8_string("Привет, мир! 😀 γειά σου κόσμος こんにちは世界");
|
||||
auto string = AK::utf8_to_utf16(utf8_string);
|
||||
Utf16View view { string };
|
||||
EXPECT_EQ(view.to_utf8(Utf16View::AllowInvalidCodeUnits::Yes), utf8_string);
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ TEST_CASE(decode_utf8)
|
|||
EXPECT(valid_bytes == (size_t)utf8.byte_length());
|
||||
|
||||
u32 expected[] = { 1055, 1088, 1080, 1074, 1077, 1090, 44, 32, 1084, 1080, 1088, 33, 32, 128512, 32, 947, 949, 953, 940, 32, 963, 959, 965, 32, 954, 972, 963, 956, 959, 962, 32, 12371, 12435, 12395, 12385, 12399, 19990, 30028 };
|
||||
String expected_underlying_bytes[] = { "П", "р", "и", "в", "е", "т", ",", " ", "м", "и", "р", "!", " ", "😀", " ", "γ", "ε", "ι", "ά", " ", "σ", "ο", "υ", " ", "κ", "ό", "σ", "μ", "ο", "ς", " ", "こ", "ん", "に", "ち", "は", "世", "界" };
|
||||
DeprecatedString expected_underlying_bytes[] = { "П", "р", "и", "в", "е", "т", ",", " ", "м", "и", "р", "!", " ", "😀", " ", "γ", "ε", "ι", "ά", " ", "σ", "ο", "υ", " ", "κ", "ό", "σ", "μ", "ο", "ς", " ", "こ", "ん", "に", "ち", "は", "世", "界" };
|
||||
size_t expected_size = sizeof(expected) / sizeof(expected[0]);
|
||||
|
||||
size_t i = 0;
|
||||
|
|
@ -125,7 +125,7 @@ TEST_CASE(decode_invalid_ut8)
|
|||
char raw_data[] = { 'a', 'b', (char)0xA0, 'd' };
|
||||
Utf8View view { StringView { raw_data, 4 } };
|
||||
u32 expected_characters[] = { 'a', 'b', 0xFFFD, 'd' };
|
||||
String expected_underlying_bytes[] = { "a", "b", "\xA0", "d" };
|
||||
DeprecatedString expected_underlying_bytes[] = { "a", "b", "\xA0", "d" };
|
||||
size_t expected_size = sizeof(expected_characters) / sizeof(expected_characters[0]);
|
||||
size_t i = 0;
|
||||
for (auto it = view.begin(); it != view.end(); ++it) {
|
||||
|
|
@ -143,7 +143,7 @@ TEST_CASE(decode_invalid_ut8)
|
|||
char raw_data[] = { 'a', 'b', (char)0xC0, 'd', 'e' };
|
||||
Utf8View view { StringView { raw_data, 5 } };
|
||||
u32 expected_characters[] = { 'a', 'b', 0xFFFD, 'd', 'e' };
|
||||
String expected_underlying_bytes[] = { "a", "b", "\xC0", "d", "e" };
|
||||
DeprecatedString expected_underlying_bytes[] = { "a", "b", "\xC0", "d", "e" };
|
||||
size_t expected_size = sizeof(expected_characters) / sizeof(expected_characters[0]);
|
||||
size_t i = 0;
|
||||
for (auto it = view.begin(); it != view.end(); ++it) {
|
||||
|
|
@ -161,7 +161,7 @@ TEST_CASE(decode_invalid_ut8)
|
|||
char raw_data[] = { 'a', 'b', (char)0x90, 'd' };
|
||||
Utf8View view { StringView { raw_data, 4 } };
|
||||
u32 expected_characters[] = { 'a', 'b', 0xFFFD, 'd' };
|
||||
String expected_underlying_bytes[] = { "a", "b", "\x90", "d" };
|
||||
DeprecatedString expected_underlying_bytes[] = { "a", "b", "\x90", "d" };
|
||||
size_t expected_size = sizeof(expected_characters) / sizeof(expected_characters[0]);
|
||||
size_t i = 0;
|
||||
for (auto it = view.begin(); it != view.end(); ++it) {
|
||||
|
|
@ -179,7 +179,7 @@ TEST_CASE(decode_invalid_ut8)
|
|||
char raw_data[] = { 'a', 'b', 'c', (char)0x90 };
|
||||
Utf8View view { StringView { raw_data, 4 } };
|
||||
u32 expected_characters[] = { 'a', 'b', 'c', 0xFFFD };
|
||||
String expected_underlying_bytes[] = { "a", "b", "c", "\x90" };
|
||||
DeprecatedString expected_underlying_bytes[] = { "a", "b", "c", "\x90" };
|
||||
size_t expected_size = sizeof(expected_characters) / sizeof(expected_characters[0]);
|
||||
size_t i = 0;
|
||||
for (auto it = view.begin(); it != view.end(); ++it) {
|
||||
|
|
@ -206,7 +206,7 @@ TEST_CASE(decode_invalid_ut8)
|
|||
// https://www.unicode.org/versions/Unicode14.0.0/ch03.pdf , section "U+FFFD Substitution of Maximal Subparts"
|
||||
// However, that would go against how we deal with several other kinds of errors, so we stick to emitting only one U+FFFD.
|
||||
u32 expected_characters[] = { 'a', 0xFFFD, 'b' };
|
||||
String expected_underlying_bytes[] = { "a", "\xF4\xA3\x91\x96", "b" };
|
||||
DeprecatedString expected_underlying_bytes[] = { "a", "\xF4\xA3\x91\x96", "b" };
|
||||
size_t expected_size = sizeof(expected_characters) / sizeof(expected_characters[0]);
|
||||
size_t i = 0;
|
||||
for (auto it = view.begin(); it != view.end(); ++it) {
|
||||
|
|
|
|||
|
|
@ -18,21 +18,21 @@ struct Object : public RefCounted<Object> {
|
|||
|
||||
TEST_CASE(basic)
|
||||
{
|
||||
Variant<int, String> the_value { 42 };
|
||||
Variant<int, DeprecatedString> the_value { 42 };
|
||||
EXPECT(the_value.has<int>());
|
||||
EXPECT_EQ(the_value.get<int>(), 42);
|
||||
the_value = String("42");
|
||||
EXPECT(the_value.has<String>());
|
||||
EXPECT_EQ(the_value.get<String>(), "42");
|
||||
the_value = DeprecatedString("42");
|
||||
EXPECT(the_value.has<DeprecatedString>());
|
||||
EXPECT_EQ(the_value.get<DeprecatedString>(), "42");
|
||||
}
|
||||
|
||||
TEST_CASE(visit)
|
||||
{
|
||||
bool correct = false;
|
||||
Variant<int, String, float> the_value { 42.0f };
|
||||
Variant<int, DeprecatedString, float> the_value { 42.0f };
|
||||
the_value.visit(
|
||||
[&](int const&) { correct = false; },
|
||||
[&](String const&) { correct = false; },
|
||||
[&](DeprecatedString const&) { correct = false; },
|
||||
[&](float const&) { correct = true; });
|
||||
EXPECT(correct);
|
||||
}
|
||||
|
|
@ -40,10 +40,10 @@ TEST_CASE(visit)
|
|||
TEST_CASE(visit_const)
|
||||
{
|
||||
bool correct = false;
|
||||
Variant<int, String> const the_value { "42"sv };
|
||||
Variant<int, DeprecatedString> const the_value { "42"sv };
|
||||
|
||||
the_value.visit(
|
||||
[&](String const&) { correct = true; },
|
||||
[&](DeprecatedString const&) { correct = true; },
|
||||
[&](auto&) {},
|
||||
[&](auto const&) {});
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ TEST_CASE(visit_const)
|
|||
correct = false;
|
||||
auto the_value_but_not_const = the_value;
|
||||
the_value_but_not_const.visit(
|
||||
[&](String const&) { correct = true; },
|
||||
[&](DeprecatedString const&) { correct = true; },
|
||||
[&](auto&) {});
|
||||
|
||||
EXPECT(correct);
|
||||
|
|
@ -168,13 +168,13 @@ TEST_CASE(duplicated_types)
|
|||
|
||||
TEST_CASE(return_values)
|
||||
{
|
||||
using MyVariant = Variant<int, String, float>;
|
||||
using MyVariant = Variant<int, DeprecatedString, float>;
|
||||
{
|
||||
MyVariant the_value { 42.0f };
|
||||
|
||||
float value = the_value.visit(
|
||||
[&](int const&) { return 1.0f; },
|
||||
[&](String const&) { return 2.0f; },
|
||||
[&](DeprecatedString const&) { return 2.0f; },
|
||||
[&](float const& f) { return f; });
|
||||
EXPECT_EQ(value, 42.0f);
|
||||
}
|
||||
|
|
@ -183,17 +183,17 @@ TEST_CASE(return_values)
|
|||
|
||||
int value = the_value.visit(
|
||||
[&](int& i) { return i; },
|
||||
[&](String&) { return 2; },
|
||||
[&](DeprecatedString&) { return 2; },
|
||||
[&](float&) { return 3; });
|
||||
EXPECT_EQ(value, 42);
|
||||
}
|
||||
{
|
||||
const MyVariant the_value { "str" };
|
||||
|
||||
String value = the_value.visit(
|
||||
[&](int const&) { return String { "wrong" }; },
|
||||
[&](String const& s) { return s; },
|
||||
[&](float const&) { return String { "wrong" }; });
|
||||
DeprecatedString value = the_value.visit(
|
||||
[&](int const&) { return DeprecatedString { "wrong" }; },
|
||||
[&](DeprecatedString const& s) { return s; },
|
||||
[&](float const&) { return DeprecatedString { "wrong" }; });
|
||||
EXPECT_EQ(value, "str");
|
||||
}
|
||||
}
|
||||
|
|
@ -201,11 +201,11 @@ TEST_CASE(return_values)
|
|||
TEST_CASE(return_values_by_reference)
|
||||
{
|
||||
auto ref = adopt_ref_if_nonnull(new (nothrow) Object());
|
||||
Variant<int, String, float> the_value { 42.0f };
|
||||
Variant<int, DeprecatedString, float> the_value { 42.0f };
|
||||
|
||||
auto& value = the_value.visit(
|
||||
[&](int const&) -> RefPtr<Object>& { return ref; },
|
||||
[&](String const&) -> RefPtr<Object>& { return ref; },
|
||||
[&](DeprecatedString const&) -> RefPtr<Object>& { return ref; },
|
||||
[&](float const&) -> RefPtr<Object>& { return ref; });
|
||||
|
||||
EXPECT_EQ(ref, value);
|
||||
|
|
@ -223,7 +223,7 @@ struct HoldsFloat {
|
|||
TEST_CASE(copy_assign)
|
||||
{
|
||||
{
|
||||
Variant<int, String, float> the_value { 42.0f };
|
||||
Variant<int, DeprecatedString, float> the_value { 42.0f };
|
||||
|
||||
VERIFY(the_value.has<float>());
|
||||
EXPECT_EQ(the_value.get<float>(), 42.0f);
|
||||
|
|
@ -233,12 +233,12 @@ TEST_CASE(copy_assign)
|
|||
VERIFY(the_value.has<int>());
|
||||
EXPECT_EQ(the_value.get<int>(), 12);
|
||||
|
||||
the_value = String("Hello, world!");
|
||||
VERIFY(the_value.has<String>());
|
||||
EXPECT_EQ(the_value.get<String>(), "Hello, world!");
|
||||
the_value = DeprecatedString("Hello, world!");
|
||||
VERIFY(the_value.has<DeprecatedString>());
|
||||
EXPECT_EQ(the_value.get<DeprecatedString>(), "Hello, world!");
|
||||
}
|
||||
{
|
||||
Variant<HoldsInt, String, HoldsFloat> the_value { HoldsFloat { 42.0f } };
|
||||
Variant<HoldsInt, DeprecatedString, HoldsFloat> the_value { HoldsFloat { 42.0f } };
|
||||
|
||||
VERIFY(the_value.has<HoldsFloat>());
|
||||
EXPECT_EQ(the_value.get<HoldsFloat>().f, 42.0f);
|
||||
|
|
@ -248,9 +248,9 @@ TEST_CASE(copy_assign)
|
|||
VERIFY(the_value.has<HoldsInt>());
|
||||
EXPECT_EQ(the_value.get<HoldsInt>().i, 12);
|
||||
|
||||
the_value = String("Hello, world!");
|
||||
VERIFY(the_value.has<String>());
|
||||
EXPECT_EQ(the_value.get<String>(), "Hello, world!");
|
||||
the_value = DeprecatedString("Hello, world!");
|
||||
VERIFY(the_value.has<DeprecatedString>());
|
||||
EXPECT_EQ(the_value.get<DeprecatedString>(), "Hello, world!");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@
|
|||
#include "AK/ReverseIterator.h"
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/NonnullOwnPtrVector.h>
|
||||
#include <AK/OwnPtr.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/Vector.h>
|
||||
|
||||
TEST_CASE(construct)
|
||||
|
|
@ -38,19 +38,19 @@ TEST_CASE(ints)
|
|||
|
||||
TEST_CASE(strings)
|
||||
{
|
||||
Vector<String> strings;
|
||||
Vector<DeprecatedString> strings;
|
||||
strings.append("ABC");
|
||||
strings.append("DEF");
|
||||
|
||||
int loop_counter = 0;
|
||||
for (String const& string : strings) {
|
||||
for (DeprecatedString const& string : strings) {
|
||||
EXPECT(!string.is_null());
|
||||
EXPECT(!string.is_empty());
|
||||
++loop_counter;
|
||||
}
|
||||
|
||||
loop_counter = 0;
|
||||
for (auto& string : (const_cast<Vector<String> const&>(strings))) {
|
||||
for (auto& string : (const_cast<Vector<DeprecatedString> const&>(strings))) {
|
||||
EXPECT(!string.is_null());
|
||||
EXPECT(!string.is_empty());
|
||||
++loop_counter;
|
||||
|
|
@ -60,7 +60,7 @@ TEST_CASE(strings)
|
|||
|
||||
TEST_CASE(strings_insert_ordered)
|
||||
{
|
||||
Vector<String> strings;
|
||||
Vector<DeprecatedString> strings;
|
||||
strings.append("abc");
|
||||
strings.append("def");
|
||||
strings.append("ghi");
|
||||
|
|
@ -163,12 +163,12 @@ TEST_CASE(vector_compare)
|
|||
EXPECT_EQ(ints.size(), 1000u);
|
||||
EXPECT_EQ(ints, same_ints);
|
||||
|
||||
Vector<String> strings;
|
||||
Vector<String> same_strings;
|
||||
Vector<DeprecatedString> strings;
|
||||
Vector<DeprecatedString> same_strings;
|
||||
|
||||
for (int i = 0; i < 1000; ++i) {
|
||||
strings.append(String::number(i));
|
||||
same_strings.append(String::number(i));
|
||||
strings.append(DeprecatedString::number(i));
|
||||
same_strings.append(DeprecatedString::number(i));
|
||||
}
|
||||
|
||||
EXPECT_EQ(strings.size(), 1000u);
|
||||
|
|
@ -178,9 +178,9 @@ TEST_CASE(vector_compare)
|
|||
TEST_CASE(grow_past_inline_capacity)
|
||||
{
|
||||
auto make_vector = [] {
|
||||
Vector<String, 16> strings;
|
||||
Vector<DeprecatedString, 16> strings;
|
||||
for (int i = 0; i < 32; ++i) {
|
||||
strings.append(String::number(i));
|
||||
strings.append(DeprecatedString::number(i));
|
||||
}
|
||||
return strings;
|
||||
};
|
||||
|
|
@ -286,7 +286,7 @@ TEST_CASE(remove_all_matching)
|
|||
TEST_CASE(nonnullownptrvector)
|
||||
{
|
||||
struct Object {
|
||||
String string;
|
||||
DeprecatedString string;
|
||||
};
|
||||
NonnullOwnPtrVector<Object> objects;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
#include <LibTest/TestCase.h>
|
||||
|
||||
#include <AK/String.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/WeakPtr.h>
|
||||
#include <AK/Weakable.h>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue