QmlDesigner: use GTEST_INTERNAL_HAS_STRING_VIEW for str compare

constData() was a workaround for the tests

Task-number: QDS-9847
Change-Id: I23fcca794ab50101ae70034079af46303c98c648
Reviewed-by: Marco Bubke <marco.bubke@qt.io>

3 files changed, 12 insertions, 16 deletions

diff --git a/src/libs/utils/smallstring.h b/src/libs/utils/smallstring.h
index 90118a017a..f4cd6b749f 100644
--- a/src/libs/utils/smallstring.h
+++ b/src/libs/utils/smallstring.h
@@ -278,11 +278,6 @@ public:
         return Q_LIKELY(isShortString()) ? m_data.shortString : m_data.reference.pointer;
     }
 
-    const char *constData() const noexcept
-    {
-        return data();
-    }
-
     iterator begin() noexcept
     {
         return data();
@@ -315,7 +310,7 @@ public:
 
     const_iterator begin() const noexcept
     {
-        return constData();
+        return data();
     }
 
     const_iterator end() const noexcept
diff --git a/tests/unit/unittest/CMakeLists.txt b/tests/unit/unittest/CMakeLists.txt
index 6e694f705c..5d53959a7b 100644
--- a/tests/unit/unittest/CMakeLists.txt
+++ b/tests/unit/unittest/CMakeLists.txt
@@ -29,6 +29,7 @@ add_qtc_test(unittest GTEST
     Qt6Core5Compat QmlJS Sqlite SqliteC
     Googletest
   DEFINES
+    GTEST_INTERNAL_HAS_STRING_VIEW
     QT_NO_CAST_TO_ASCII
     QT_RESTRICTED_CAST_FROM_ASCII
     UNIT_TESTS
diff --git a/tests/unit/unittest/smallstring-test.cpp b/tests/unit/unittest/smallstring-test.cpp
index 2f12e4413a..a77e0bdc2d 100644
--- a/tests/unit/unittest/smallstring-test.cpp
+++ b/tests/unit/unittest/smallstring-test.cpp
@@ -123,7 +123,7 @@ TEST(SmallString, MaximumShortSmallString)
 {
     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)
@@ -219,21 +219,21 @@ TEST(SmallString, SmallStringLiteralShortSmallStringDataAccess)
 {
     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)
 {
     SmallStringLiteral literalText("short string");
 
-    ASSERT_THAT(literalText.data(), StrEq("short string"));
+    ASSERT_THAT(literalText, StrEq("short string"));
 }
 
 TEST(SmallString, ReferenceDataAccess)
 {
     SmallString literalText("short string");
 
-    ASSERT_THAT(literalText.constData(), StrEq("short string"));
+    ASSERT_THAT(literalText, StrEq("short string"));
 }
 
 TEST(SmallString, ShortDataAccess)
@@ -241,7 +241,7 @@ TEST(SmallString, ShortDataAccess)
     const char *shortCString = "short string";
     auto shortText = SmallString::fromUtf8(shortCString);
 
-    ASSERT_THAT(shortText.constData(), StrEq("short string"));
+    ASSERT_THAT(shortText, StrEq("short string"));
 }
 
 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";
     auto longText = SmallString::fromUtf8(longCString);
 
-    ASSERT_THAT(longText.constData(), StrEq(longCString));
+    ASSERT_THAT(longText, StrEq(longCString));
 }
 
 TEST(SmallString, LongSmallStringHasShortSmallStringSizeZero)
@@ -962,8 +962,8 @@ TEST(SmallString, EqualCStringArrayOperator)
 
 TEST(SmallString, EqualCStringPointerOperator)
 {
-    ASSERT_TRUE(SmallString("text") == SmallString("text").data());
-    ASSERT_FALSE(SmallString("text") == SmallString("text2").data());
+    ASSERT_TRUE(SmallString("text") == std::string("text").data());
+    ASSERT_FALSE(SmallString("text") == std::string("text2").data());
 }
 
 TEST(SmallString, EqualSmallStringViewOperator)
@@ -992,8 +992,8 @@ TEST(SmallString, UnequalCStringArrayOperator)
 
 TEST(SmallString, UnequalCStringPointerOperator)
 {
-    ASSERT_FALSE(SmallString("text") != SmallString("text").data());
-    ASSERT_TRUE(SmallString("text") != SmallString("text2").data());
+    ASSERT_FALSE(SmallString("text") != std::string("text").data());
+    ASSERT_TRUE(SmallString("text") != std::string("text2").data());
 }
 
 TEST(SmallString, UnequalSmallStringViewArrayOperator)