tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "libutil: no special copy from StaticString16" am: 7d067aee62

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1751786

Change-Id: Icdfa1f8ba13af20e8b9d18104429fef4371d85c4
This commit is contained in:
Treehugger Robot 2021-06-30 02:33:00 +00:00 committed by Automerger Merge Worker
commit ece939ecc9
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libutils/String16_test.cpp
View file

@ -58,6 +58,14 @@ TEST(String16Test, Copy) {
EXPECT_STR16EQ(u"Verify me", another);
}
TEST(String16Test, CopyAssign) {
String16 tmp("Verify me");
String16 another;
another = tmp;
EXPECT_STR16EQ(u"Verify me", tmp);
EXPECT_STR16EQ(u"Verify me", another);
}
TEST(String16Test, Move) {
String16 tmp("Verify me");
String16 another(std::move(tmp));
@ -130,10 +138,6 @@ TEST(String16Test, StaticStringMove) {
String16 another(std::move(tmp));
EXPECT_STR16EQ(u"Verify me", another);
EXPECT_TRUE(another.isStaticString());
// move/copy from StaticString16 is specialized (just copy the handle).
// no extra actions required.
EXPECT_STR16EQ(u"Verify me", tmp);
EXPECT_TRUE(tmp.isStaticString());
}
TEST(String16Test, StaticStringSize) {
@ -185,16 +189,22 @@ TEST(String16Test, StringSetToStaticString) {
EXPECT_STR16EQ(u"Verify me", another);
}
TEST(String16Test, StringCopyAssignFromStaticString) {
StaticString16 tmp(u"Verify me");
String16 another(u"nonstatic");
another = tmp;
EXPECT_STR16EQ(u"Verify me", another);
EXPECT_TRUE(another.isStaticString());
EXPECT_STR16EQ(u"Verify me", tmp);
EXPECT_TRUE(tmp.isStaticString());
}
TEST(String16Test, StringMoveAssignFromStaticString) {
StaticString16 tmp(u"Verify me");
String16 another(u"nonstatic");
another = std::move(tmp);
EXPECT_STR16EQ(u"Verify me", another);
EXPECT_TRUE(another.isStaticString());
// move/copy from StaticString16 is specialized (just copy handle).
// no extra actions required.
EXPECT_STR16EQ(u"Verify me", tmp);
EXPECT_TRUE(tmp.isStaticString());
}
TEST(String16Test, EmptyStringIsStatic) {

10
libutils/include/utils/String16.h
View file

@ -174,16 +174,6 @@ protected:
template <size_t N>
explicit constexpr String16(const StaticData<N>& s) : mString(s.data) {}
public:
template <size_t N>
explicit constexpr String16(const StaticString16<N>& s) : mString(s.mString) {}
template <size_t N>
constexpr String16& operator=(const StaticString16<N>& s) {
release();
mString = s.mString;
return *this;
}
};
// String16 can be trivially moved using memcpy() because moving does not