feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: use GTEST_INTERNAL_HAS_STRING_VIEW for str compare

Browse Source 
constData() was a workaround for the tests

Task-number: QDS-9847
Change-Id: I23fcca794ab50101ae70034079af46303c98c648
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Tim Jenssen
2023-05-08 16:04:52 +02:00
committed by Marco Bubke
parent ed6008c1c2
commit 1d183e4de7
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/smallstring.h
View File

@@ -278,11 +278,6 @@ public:
return Q_LIKELY(isShortString()) ? m_data.shortString : m_data.reference.pointer; return Q_LIKELY(isShortString()) ? m_data.shortString : m_data.reference.pointer;
} }
const char *constData() const noexcept
{
return data();
}
iterator begin() noexcept iterator begin() noexcept
{ {
return data(); return data();
@@ -315,7 +310,7 @@ public:
const_iterator begin() const noexcept const_iterator begin() const noexcept
{ {
return constData(); return data();
} }
const_iterator end() const noexcept const_iterator end() const noexcept

1
tests/unit/unittest/CMakeLists.txt
View File

@@ -29,6 +29,7 @@ add_qtc_test(unittest GTEST
Qt6Core5Compat QmlJS Sqlite SqliteC Qt6Core5Compat QmlJS Sqlite SqliteC
Googletest Googletest
DEFINES DEFINES
GTEST_INTERNAL_HAS_STRING_VIEW
QT_NO_CAST_TO_ASCII QT_NO_CAST_TO_ASCII
QT_RESTRICTED_CAST_FROM_ASCII QT_RESTRICTED_CAST_FROM_ASCII
UNIT_TESTS UNIT_TESTS

20
tests/unit/unittest/smallstring-test.cpp
View File

@@ -123,7 +123,7 @@ TEST(SmallString, MaximumShortSmallString)
{ {
SmallString maximumShortText("very very very very short text", 30); SmallString maximumShortText("very very very very short text", 30);
ASSERT_THAT(maximumShortText.constData(), StrEq("very very very very short text")); ASSERT_THAT(maximumShortText, StrEq("very very very very short text"));
} }
TEST(SmallString, LongConstExpressionSmallStringIsReference) TEST(SmallString, LongConstExpressionSmallStringIsReference)
@@ -219,21 +219,21 @@ TEST(SmallString, SmallStringLiteralShortSmallStringDataAccess)
{ {
SmallStringLiteral literalText("very very very very very very very very very very very long string"); SmallStringLiteral literalText("very very very very very very very very very very very long string");
ASSERT_THAT(literalText.data(), StrEq("very very very very very very very very very very very long string")); ASSERT_THAT(literalText, StrEq("very very very very very very very very very very very long string"));
} }
TEST(SmallString, SmallStringLiteralLongSmallStringDataAccess) TEST(SmallString, SmallStringLiteralLongSmallStringDataAccess)
{ {
SmallStringLiteral literalText("short string"); SmallStringLiteral literalText("short string");
ASSERT_THAT(literalText.data(), StrEq("short string")); ASSERT_THAT(literalText, StrEq("short string"));
} }
TEST(SmallString, ReferenceDataAccess) TEST(SmallString, ReferenceDataAccess)
{ {
SmallString literalText("short string"); SmallString literalText("short string");
ASSERT_THAT(literalText.constData(), StrEq("short string")); ASSERT_THAT(literalText, StrEq("short string"));
} }
TEST(SmallString, ShortDataAccess) TEST(SmallString, ShortDataAccess)
@@ -241,7 +241,7 @@ TEST(SmallString, ShortDataAccess)
const char *shortCString = "short string"; const char *shortCString = "short string";
auto shortText = SmallString::fromUtf8(shortCString); auto shortText = SmallString::fromUtf8(shortCString);
ASSERT_THAT(shortText.constData(), StrEq("short string")); ASSERT_THAT(shortText, StrEq("short string"));
} }
TEST(SmallString, LongDataAccess) TEST(SmallString, LongDataAccess)
@@ -249,7 +249,7 @@ TEST(SmallString, LongDataAccess)
const char *longCString = "very very very very very very very very very very very long string"; const char *longCString = "very very very very very very very very very very very long string";
auto longText = SmallString::fromUtf8(longCString); auto longText = SmallString::fromUtf8(longCString);
ASSERT_THAT(longText.constData(), StrEq(longCString)); ASSERT_THAT(longText, StrEq(longCString));
} }
TEST(SmallString, LongSmallStringHasShortSmallStringSizeZero) TEST(SmallString, LongSmallStringHasShortSmallStringSizeZero)
@@ -962,8 +962,8 @@ TEST(SmallString, EqualCStringArrayOperator)
TEST(SmallString, EqualCStringPointerOperator) TEST(SmallString, EqualCStringPointerOperator)
{ {
ASSERT_TRUE(SmallString("text") == SmallString("text").data()); ASSERT_TRUE(SmallString("text") == std::string("text").data());
ASSERT_FALSE(SmallString("text") == SmallString("text2").data()); ASSERT_FALSE(SmallString("text") == std::string("text2").data());
} }
TEST(SmallString, EqualSmallStringViewOperator) TEST(SmallString, EqualSmallStringViewOperator)
@@ -992,8 +992,8 @@ TEST(SmallString, UnequalCStringArrayOperator)
TEST(SmallString, UnequalCStringPointerOperator) TEST(SmallString, UnequalCStringPointerOperator)
{ {
ASSERT_FALSE(SmallString("text") != SmallString("text").data()); ASSERT_FALSE(SmallString("text") != std::string("text").data());
ASSERT_TRUE(SmallString("text") != SmallString("text2").data()); ASSERT_TRUE(SmallString("text") != std::string("text2").data());
} }
TEST(SmallString, UnequalSmallStringViewArrayOperator) TEST(SmallString, UnequalSmallStringViewArrayOperator)