diff --git a/test/test_string_u16_external_buffer.cpp b/test/test_string_u16_external_buffer.cpp index 2cff9cb3e..8e271ad6b 100644 --- a/test/test_string_u16_external_buffer.cpp +++ b/test/test_string_u16_external_buffer.cpp @@ -460,61 +460,6 @@ namespace #endif } - //************************************************************************* - TEST_FIXTURE(SetupFixture, test_move_constructor_move_the_string) - { - TextBuffer buffer1{ 0 }; - Text text(initial_text.c_str(), buffer1.data(), buffer1.size()); - - size_t original_size = text.size(); - size_t original_max_size = text.max_size(); - - TextBuffer buffer2{ 0 }; - Text text2(etl::move(text), buffer2.data(), buffer2.size()); - - // Check the source string. - CHECK_TRUE(text.empty()); - CHECK_FALSE(text.full()); - CHECK_EQUAL(0U, text.size()); - CHECK_EQUAL(original_max_size, text.max_size()); - CHECK_TRUE(text.data() != nullptr); - - // Check the destination string. - CHECK_FALSE(text2.empty()); - CHECK_TRUE(text2.full()); - CHECK_EQUAL(original_size, text2.size()); - CHECK_EQUAL(original_max_size, text2.max_size()); - CHECK_TRUE(text2.data() != nullptr); - CHECK_TRUE(std::equal(initial_text.begin(), initial_text.end(), text2.begin())); - } - - //************************************************************************* - TEST_FIXTURE(SetupFixture, test_move_constructor_steal_the_string) - { - TextBuffer buffer{ 0 }; - Text text(initial_text.c_str(), buffer.data(), buffer.size()); - - size_t original_size = text.size(); - size_t original_max_size = text.max_size(); - - Text text2(etl::move(text)); - - // Check the source string. - CHECK_TRUE(text.empty()); - CHECK_TRUE(text.full()); - CHECK_EQUAL(0U, text.size()); - CHECK_EQUAL(0U, text.max_size()); - CHECK_TRUE(text.data() == nullptr); - - // Check the destination string. - CHECK_FALSE(text2.empty()); - CHECK_TRUE(text2.full()); - CHECK_EQUAL(original_size, text2.size()); - CHECK_EQUAL(original_max_size, text2.max_size()); - CHECK_TRUE(text2.data() != nullptr); - CHECK_TRUE(std::equal(initial_text.begin(), initial_text.end(), text2.begin())); - } - //************************************************************************* TEST_FIXTURE(SetupFixture, test_construct_position_length) { diff --git a/test/test_string_u32_external_buffer.cpp b/test/test_string_u32_external_buffer.cpp index e372fce17..966500158 100644 --- a/test/test_string_u32_external_buffer.cpp +++ b/test/test_string_u32_external_buffer.cpp @@ -460,61 +460,6 @@ namespace #endif } - //************************************************************************* - TEST_FIXTURE(SetupFixture, test_move_constructor_move_the_string) - { - TextBuffer buffer1{ 0 }; - Text text(initial_text.c_str(), buffer1.data(), buffer1.size()); - - size_t original_size = text.size(); - size_t original_max_size = text.max_size(); - - TextBuffer buffer2{ 0 }; - Text text2(etl::move(text), buffer2.data(), buffer2.size()); - - // Check the source string. - CHECK_TRUE(text.empty()); - CHECK_FALSE(text.full()); - CHECK_EQUAL(0U, text.size()); - CHECK_EQUAL(original_max_size, text.max_size()); - CHECK_TRUE(text.data() != nullptr); - - // Check the destination string. - CHECK_FALSE(text2.empty()); - CHECK_TRUE(text2.full()); - CHECK_EQUAL(original_size, text2.size()); - CHECK_EQUAL(original_max_size, text2.max_size()); - CHECK_TRUE(text2.data() != nullptr); - CHECK_TRUE(std::equal(initial_text.begin(), initial_text.end(), text2.begin())); - } - - //************************************************************************* - TEST_FIXTURE(SetupFixture, test_move_constructor_steal_the_string) - { - TextBuffer buffer{ 0 }; - Text text(initial_text.c_str(), buffer.data(), buffer.size()); - - size_t original_size = text.size(); - size_t original_max_size = text.max_size(); - - Text text2(etl::move(text)); - - // Check the source string. - CHECK_TRUE(text.empty()); - CHECK_TRUE(text.full()); - CHECK_EQUAL(0U, text.size()); - CHECK_EQUAL(0U, text.max_size()); - CHECK_TRUE(text.data() == nullptr); - - // Check the destination string. - CHECK_FALSE(text2.empty()); - CHECK_TRUE(text2.full()); - CHECK_EQUAL(original_size, text2.size()); - CHECK_EQUAL(original_max_size, text2.max_size()); - CHECK_TRUE(text2.data() != nullptr); - CHECK_TRUE(std::equal(initial_text.begin(), initial_text.end(), text2.begin())); - } - //************************************************************************* TEST_FIXTURE(SetupFixture, test_construct_position_length) { diff --git a/test/test_string_u8_external_buffer.cpp b/test/test_string_u8_external_buffer.cpp index ca5e9bd51..bc2caaaf4 100644 --- a/test/test_string_u8_external_buffer.cpp +++ b/test/test_string_u8_external_buffer.cpp @@ -463,61 +463,6 @@ namespace #endif } - //************************************************************************* - TEST_FIXTURE(SetupFixture, test_move_constructor_move_the_string) - { - TextBuffer buffer1{ 0 }; - Text text(initial_text.c_str(), buffer1.data(), buffer1.size()); - - size_t original_size = text.size(); - size_t original_max_size = text.max_size(); - - TextBuffer buffer2{ 0 }; - Text text2(etl::move(text), buffer2.data(), buffer2.size()); - - // Check the source string. - CHECK_TRUE(text.empty()); - CHECK_FALSE(text.full()); - CHECK_EQUAL(0U, text.size()); - CHECK_EQUAL(original_max_size, text.max_size()); - CHECK_TRUE(text.data() != nullptr); - - // Check the destination string. - CHECK_FALSE(text2.empty()); - CHECK_TRUE(text2.full()); - CHECK_EQUAL(original_size, text2.size()); - CHECK_EQUAL(original_max_size, text2.max_size()); - CHECK_TRUE(text2.data() != nullptr); - CHECK_TRUE(std::equal(initial_text.begin(), initial_text.end(), text2.begin())); - } - - //************************************************************************* - TEST_FIXTURE(SetupFixture, test_move_constructor_steal_the_string) - { - TextBuffer buffer{ 0 }; - Text text(initial_text.c_str(), buffer.data(), buffer.size()); - - size_t original_size = text.size(); - size_t original_max_size = text.max_size(); - - Text text2(etl::move(text)); - - // Check the source string. - CHECK_TRUE(text.empty()); - CHECK_TRUE(text.full()); - CHECK_EQUAL(0U, text.size()); - CHECK_EQUAL(0U, text.max_size()); - CHECK_TRUE(text.data() == nullptr); - - // Check the destination string. - CHECK_FALSE(text2.empty()); - CHECK_TRUE(text2.full()); - CHECK_EQUAL(original_size, text2.size()); - CHECK_EQUAL(original_max_size, text2.max_size()); - CHECK_TRUE(text2.data() != nullptr); - CHECK_TRUE(std::equal(initial_text.begin(), initial_text.end(), text2.begin())); - } - //************************************************************************* TEST_FIXTURE(SetupFixture, test_construct_position_length) {