Skip to content

Commit c9dcac2

Browse files
author
Jakob Riedle
committed
Updated the tests to use the new name "string" instead of "utf8_string"
1 parent 9121fbd commit c9dcac2

File tree

8 files changed

+45
-45
lines changed

8 files changed

+45
-45
lines changed

‎include/tinyutf8/tinyutf8.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,7 @@ namespace tiny_utf8
14051405
value_type raw_at( size_type byte_index ) const noexcept(TINY_UTF8_NOEXCEPT) {
14061406
size_type size = this->size();
14071407
if( byte_index >= size ){
1408-
TINY_UTF8_THROW( "basic_utf8_string::(raw_)at" , byte_index >= size );
1408+
TINY_UTF8_THROW( "tiny_utf8::basic_string::(raw_)at" , byte_index >= size );
14091409
return 0;
14101410
}
14111411
const data_type* pos = get_buffer() + byte_index;
@@ -3471,7 +3471,7 @@ namespace tiny_utf8
34713471
// Bound checks...
34723472
size_type data_len = size();
34733473
if( index > data_len ){
3474-
TINY_UTF8_THROW( "basic_utf8_string::(raw_)substr" , index > data_len );
3474+
TINY_UTF8_THROW( "tiny_utf8::basic_string::(raw_)substr" , index > data_len );
34753475
return {};
34763476
}
34773477
size_type end_index = index + byte_count;
@@ -3874,7 +3874,7 @@ namespace tiny_utf8
38743874
// Bound checks...
38753875
size_type old_data_len = size();
38763876
if( index > old_data_len ){
3877-
TINY_UTF8_THROW( "basic_utf8_string::(raw_)insert" , index > old_data_len );
3877+
TINY_UTF8_THROW( "tiny_utf8::basic_string::(raw_)insert" , index > old_data_len );
38783878
return *this;
38793879
}
38803880

@@ -4234,7 +4234,7 @@ namespace tiny_utf8
42344234
// Bound checks...
42354235
size_type old_data_len = size();
42364236
if( index > old_data_len ){
4237-
TINY_UTF8_THROW( "basic_utf8_string::(raw_)replace" , index > old_data_len );
4237+
TINY_UTF8_THROW( "tiny_utf8::basic_string::(raw_)replace" , index > old_data_len );
42384238
return *this;
42394239
}
42404240
size_type end_index = index + replaced_len;
@@ -4649,7 +4649,7 @@ namespace tiny_utf8
46494649
// Bound checks...
46504650
size_type old_data_len = size();
46514651
if( index > old_data_len ){
4652-
TINY_UTF8_THROW( "basic_utf8_string::(raw_)erase" , index > old_data_len );
4652+
TINY_UTF8_THROW( "tiny_utf8::basic_string::(raw_)erase" , index > old_data_len );
46534653
return *this;
46544654
}
46554655
if( !len )

‎test/src/helpers/helpers_ssotestutils.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
namespace Helpers_SSOTestUtils
1111
{
1212

13-
template<class BASIC_UTF8_STRING>
14-
class SSO_Capacity : public BASIC_UTF8_STRING
13+
template<class BASIC_STRING>
14+
class SSO_Capacity : public BASIC_STRING
1515
{
1616
public:
17-
static constexpr typename BASIC_UTF8_STRING::size_type get_sso_capacity() noexcept
17+
static constexpr typename BASIC_STRING::size_type get_sso_capacity() noexcept
1818
{
19-
return BASIC_UTF8_STRING::get_sso_capacity();
19+
return BASIC_STRING::get_sso_capacity();
2020
}
2121
};
2222

‎test/src/test_construction.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
TEST(TinyUTF8, CTor_TakeALiteral)
1111
{
12-
tiny_utf8::utf8_string str(U"TEST: ツ♫");
12+
tiny_utf8::string str(U"TEST: ツ♫");
1313

1414
EXPECT_EQ(str.length(), 8);
1515
EXPECT_EQ(str.size(), 12);
@@ -21,7 +21,7 @@ TEST(TinyUTF8, CTor_TakeALiteral)
2121

2222
TEST(TinyUTF8, CTor_TakeALiteral_SSOAndNoSSO)
2323
{
24-
using test_utf8_string = tiny_utf8::basic_utf8_string<char32_t, char, std::allocator<char>>;
24+
using test_utf8_string = tiny_utf8::basic_string<char32_t, char, std::allocator<char>>;
2525

2626
constexpr uint32_t TEST_LITERAL_U_LENGTH = 1;
2727
constexpr uint32_t TEST_STRING_LENGTH = 100;
@@ -49,7 +49,7 @@ TEST(TinyUTF8, CTor_TakeALiteral_SSOAndNoSSO)
4949

5050
TEST(TinyUTF8, CTor_TakeALiteralWithMaxCodePoints)
5151
{
52-
tiny_utf8::utf8_string str(U"ツ♫", 1);
52+
tiny_utf8::string str(U"ツ♫", 1);
5353

5454
EXPECT_EQ(str.length(), 1);
5555
EXPECT_EQ(str.size(), 3);
@@ -62,7 +62,7 @@ TEST(TinyUTF8, CTor_TakeALiteralWithMaxCodePoints)
6262
TEST(TinyUTF8, CTor_TakeAnAnsiString)
6363
{
6464
const std::string ansi_str("Loewen, Boeren, Voegel und Koefer sind Tiere.");
65-
tiny_utf8::utf8_string str(ansi_str);
65+
tiny_utf8::string str(ansi_str);
6666

6767
EXPECT_EQ(ansi_str.length(), 45);
6868
EXPECT_EQ(ansi_str.size(), 45);
@@ -76,8 +76,8 @@ TEST(TinyUTF8, CTor_TakeAnAnsiString)
7676

7777
TEST(TinyUTF8, CopyCTor)
7878
{
79-
tiny_utf8::utf8_string str_orig(U"Hello ツ World");
80-
tiny_utf8::utf8_string str(str_orig);
79+
tiny_utf8::string str_orig(U"Hello ツ World");
80+
tiny_utf8::string str(str_orig);
8181

8282
EXPECT_EQ(str.length(), 15);
8383
EXPECT_EQ(str.size(), 17);

‎test/src/test_conversion.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
TEST(TinyUTF8, ToWideLiteral)
88
{
9-
tiny_utf8::utf8_string str(std::string("Löwen, Bären, Vögel und Käfer sind Tiere."));
9+
tiny_utf8::string str(std::string("Löwen, Bären, Vögel und Käfer sind Tiere."));
1010

1111
std::unique_ptr<char32_t[]> ptr{ new char32_t[str.length() + 1] };
1212
str.to_wide_literal(ptr.get());
1313

14-
tiny_utf8::utf8_string::const_iterator it_fwd = str.begin();
14+
tiny_utf8::string::const_iterator it_fwd = str.begin();
1515
for (size_t chcount = 0; chcount < str.length(); ++chcount)
1616
{
1717
EXPECT_TRUE((static_cast<uint64_t>(str[chcount])) == (static_cast<uint64_t>(ptr[chcount])));

‎test/src/test_iterators.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@
66

77
TEST(TinyUTF8, IteratorAccess)
88
{
9-
const tiny_utf8::utf8_string str = U"Hello ツ World ♫";
9+
const tiny_utf8::string str = U"Hello ツ World ♫";
1010

1111
EXPECT_TRUE(str.requires_unicode());
1212
EXPECT_TRUE(str.sso_active());
1313

14-
tiny_utf8::utf8_string str_fwd;
15-
tiny_utf8::utf8_string str_rev;
14+
tiny_utf8::string str_fwd;
15+
tiny_utf8::string str_rev;
1616

1717
std::copy(str.begin(), str.end(), str_fwd.begin()); // Copy using forward iterators
1818
std::copy(str.rbegin(), str.rend(), str_rev.begin()); // Copy using reverse iterators
1919

2020
EXPECT_TRUE(
2121
std::equal(str.begin(), str.end(), str_fwd.begin(),
22-
[](const tiny_utf8::utf8_string::value_type& a, const tiny_utf8::utf8_string::value_type& b) -> bool
22+
[](const tiny_utf8::string::value_type& a, const tiny_utf8::string::value_type& b) -> bool
2323
{
2424
return ((static_cast<uint64_t>(a)) == (static_cast<uint64_t>(b)));
2525
}
2626
)
2727
);
2828

29-
tiny_utf8::utf8_string::const_iterator it_src = str.end();
30-
tiny_utf8::utf8_string::const_iterator it_rev = str_rev.begin();
29+
tiny_utf8::string::const_iterator it_src = str.end();
30+
tiny_utf8::string::const_iterator it_rev = str_rev.begin();
3131
for ( /* NOTHING HERE */; it_src != str.begin(); /* NOTHING HERE */)
3232
{
3333
--it_src;
@@ -37,7 +37,7 @@ TEST(TinyUTF8, IteratorAccess)
3737
++it_rev;
3838
}
3939

40-
tiny_utf8::utf8_string::const_iterator it_fwd = str.begin();
40+
tiny_utf8::string::const_iterator it_fwd = str.begin();
4141
for (size_t chcount = 0; chcount < str.length(); ++chcount)
4242
{
4343
EXPECT_TRUE((static_cast<uint64_t>(str[chcount])) == (static_cast<uint64_t>(*it_fwd)));

‎test/src/test_manipulation.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
TEST(TinyUTF8, AppendString)
99
{
1010
// Test 2
11-
tiny_utf8::utf8_string str = U"Hello ツ";
11+
tiny_utf8::string str = U"Hello ツ";
1212
str.append(U" ♫ World");
1313

1414
EXPECT_EQ(str.length(), 15);
@@ -17,7 +17,7 @@ TEST(TinyUTF8, AppendString)
1717
EXPECT_TRUE(str.sso_active());
1818
EXPECT_FALSE(str.lut_active());
1919

20-
tiny_utf8::utf8_string tmp = U" ♫ World";
20+
tiny_utf8::string tmp = U" ♫ World";
2121
str.append(tmp);
2222

2323
EXPECT_EQ(str.length(), 23);
@@ -29,7 +29,7 @@ TEST(TinyUTF8, AppendString)
2929

3030
TEST(TinyUTF8, AppendAndShrinkString)
3131
{
32-
tiny_utf8::utf8_string str(U"TEST: ツ♫");
32+
tiny_utf8::string str(U"TEST: ツ♫");
3333

3434
EXPECT_EQ(str.capacity(), 31);
3535

@@ -88,7 +88,7 @@ TEST(TinyUTF8, AppendAndShrinkString)
8888

8989
TEST(TinyUTF8, EraseString)
9090
{
91-
tiny_utf8::utf8_string str = U"Hello ツ World ♫";
91+
tiny_utf8::string str = U"Hello ツ World ♫";
9292

9393
EXPECT_EQ(str.length(), 15);
9494
EXPECT_EQ(str.size(), 19);
@@ -113,13 +113,13 @@ TEST(TinyUTF8, EraseString)
113113

114114
TEST(TinyUTF8, SubString)
115115
{
116-
const tiny_utf8::utf8_string fullstr(U"Hello ツ World rg rth rt he rh we gxgre");
116+
const tiny_utf8::string fullstr(U"Hello ツ World rg rth rt he rh we gxgre");
117117

118-
const tiny_utf8::utf8_string str = fullstr.substr(3, 16);
119-
const tiny_utf8::utf8_string substr(U"lo ツ World rg rt");
118+
const tiny_utf8::string str = fullstr.substr(3, 16);
119+
const tiny_utf8::string substr(U"lo ツ World rg rt");
120120

121-
tiny_utf8::utf8_string::const_iterator it_str = str.begin();
122-
tiny_utf8::utf8_string::const_iterator it_sub = substr.begin();
121+
tiny_utf8::string::const_iterator it_str = str.begin();
122+
tiny_utf8::string::const_iterator it_sub = substr.begin();
123123
for ( /* NOTHING HERE */; it_sub != substr.end(); /* NOTHING HERE */)
124124
{
125125
EXPECT_TRUE((static_cast<uint64_t>(*it_str)) == (static_cast<uint64_t>(*it_sub)));
@@ -136,10 +136,10 @@ TEST(TinyUTF8, SubString)
136136

137137
TEST(TinyUTF8, ReplaceString)
138138
{
139-
tiny_utf8::utf8_string str(U"Hello ツ World");
139+
tiny_utf8::string str(U"Hello ツ World");
140140

141141
const std::string str_repl1("Hello World");
142-
const tiny_utf8::utf8_string str_repl2(U"Hello~ 🤝 ~World");
142+
const tiny_utf8::string str_repl2(U"Hello~ 🤝 ~World");
143143

144144
const char32_t ch_repl1 = U'ツ';
145145
const char32_t ch_repl2 = U'🤝';
@@ -158,7 +158,7 @@ TEST(TinyUTF8, ReplaceString)
158158
str.replace(5, 3, " ");
159159
EXPECT_TRUE(
160160
std::equal(str.begin(), str.end(), str_repl1.begin(),
161-
[](const tiny_utf8::utf8_string::value_type& a, const tiny_utf8::utf8_string::value_type& b) -> bool
161+
[](const tiny_utf8::string::value_type& a, const tiny_utf8::string::value_type& b) -> bool
162162
{
163163
return ((static_cast<uint64_t>(a)) == (static_cast<uint64_t>(b)));
164164
}
@@ -170,7 +170,7 @@ TEST(TinyUTF8, ReplaceString)
170170
str.replace(str.begin() + 5, str.begin() + 6, U"~ 🤝 ~"); // Orig:
171171
EXPECT_TRUE(
172172
std::equal(str.begin(), str.end(), str_repl2.begin(),
173-
[](const tiny_utf8::utf8_string::value_type& a, const tiny_utf8::utf8_string::value_type& b) -> bool
173+
[](const tiny_utf8::string::value_type& a, const tiny_utf8::string::value_type& b) -> bool
174174
{
175175
return ((static_cast<uint64_t>(a)) == (static_cast<uint64_t>(b)));
176176
}

‎test/src/test_noexceptions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ TEST(TinyUTF8, CTor_TakeALiteral_WithAllocator_Throw)
1717
ASSERT_FALSE(std::is_nothrow_copy_constructible<ThrowAllocator<char>>::value);
1818
ASSERT_FALSE(std::is_nothrow_move_constructible<ThrowAllocator<char>>::value);
1919

20-
using alloc_utf8_string = tiny_utf8::basic_utf8_string<char32_t, char, ThrowAllocator<char>>;
20+
using alloc_utf8_string = tiny_utf8::basic_string<char32_t, char, ThrowAllocator<char>>;
2121

2222
const char TEST_LITERAL[1] = { 'R' };
2323
const char TEST_STRING[29] = "This Is A Const Char* String";
@@ -41,7 +41,7 @@ TEST(TinyUTF8, CTor_TakeALiteral_WithAllocator_NoThrow)
4141
ASSERT_TRUE(std::is_nothrow_copy_constructible<NoThrowAllocator<char>>::value);
4242
ASSERT_TRUE(std::is_nothrow_move_constructible<NoThrowAllocator<char>>::value);
4343

44-
using alloc_utf8_string = tiny_utf8::basic_utf8_string<char32_t, char, NoThrowAllocator<char>>;
44+
using alloc_utf8_string = tiny_utf8::basic_string<char32_t, char, NoThrowAllocator<char>>;
4545

4646
const char TEST_LITERAL[1] = { 'R' };
4747
const char TEST_STRING[29] = "This Is A Const Char* String";

‎test/src/test_search.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
TEST(TinyUTF8, FindSubstr)
66
{
7-
tiny_utf8::utf8_string str = U"Hello World ツ♫";
7+
tiny_utf8::string str = U"Hello World ツ♫";
88

99
const char32_t* find_last_not_of = U"ツ♫";
1010
const char32_t* find_last_of = U"e";
@@ -19,7 +19,7 @@ TEST(TinyUTF8, FindSubstr)
1919

2020
TEST(TinyUTF8, StartsEndsWith)
2121
{
22-
tiny_utf8::utf8_string str = U"Hello World ツ♫";
22+
tiny_utf8::string str = U"Hello World ツ♫";
2323

2424
const char32_t* ends_with_positive = U"ツ♫";
2525
const char32_t* ends_with_negative = U"e";
@@ -28,10 +28,10 @@ TEST(TinyUTF8, StartsEndsWith)
2828

2929
EXPECT_EQ(str.ends_with(ends_with_positive), true);
3030
EXPECT_EQ(str.ends_with(ends_with_negative), false);
31-
EXPECT_EQ(str.ends_with(tiny_utf8::utf8_string(ends_with_positive)), true);
32-
EXPECT_EQ(str.ends_with(tiny_utf8::utf8_string(ends_with_negative)), false);
31+
EXPECT_EQ(str.ends_with(tiny_utf8::string(ends_with_positive)), true);
32+
EXPECT_EQ(str.ends_with(tiny_utf8::string(ends_with_negative)), false);
3333
EXPECT_EQ(str.starts_with(starts_with_positive), true);
3434
EXPECT_EQ(str.starts_with(starts_with_negative), false);
35-
EXPECT_EQ(str.starts_with(tiny_utf8::utf8_string(starts_with_positive)), true);
36-
EXPECT_EQ(str.starts_with(tiny_utf8::utf8_string(starts_with_negative)), false);
35+
EXPECT_EQ(str.starts_with(tiny_utf8::string(starts_with_positive)), true);
36+
EXPECT_EQ(str.starts_with(tiny_utf8::string(starts_with_negative)), false);
3737
}

0 commit comments

Comments
 (0)