From 09c22b080e27f83f5e9965eda23c16ff326681ec Mon Sep 17 00:00:00 2001 From: ali kettab Date: Sun, 8 Oct 2023 21:46:29 +0100 Subject: [PATCH] Fix listboxtest test failing under wxQt Qt uses QString::localeAwareCompare() for comparison and this is what their documentation says: "On other Unix-like systems without ICU, the comparison falls back to the system library's strcoll()". Under MSW, Qt uses CompareStringEx() IOW, Qt always compares strings by locale-specific sorting criteria and BTW this is what wxGTK was like before this commit 625ed74 (Make sorting of wxListBox, wxChoice and wxComboBox identical to the MSW sorting) --- tests/controls/listboxtest.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/controls/listboxtest.cpp b/tests/controls/listboxtest.cpp index 6073d6bba0..124f2debf4 100644 --- a/tests/controls/listboxtest.cpp +++ b/tests/controls/listboxtest.cpp @@ -109,12 +109,21 @@ void ListBoxTestCase::Sort() m_list->Append(testitems); +#ifndef __WXQT__ CPPUNIT_ASSERT_EQUAL("AAA", m_list->GetString(0)); CPPUNIT_ASSERT_EQUAL("Aaa", m_list->GetString(1)); CPPUNIT_ASSERT_EQUAL("aaa", m_list->GetString(2)); CPPUNIT_ASSERT_EQUAL("aaab", m_list->GetString(3)); CPPUNIT_ASSERT_EQUAL("aab", m_list->GetString(4)); CPPUNIT_ASSERT_EQUAL("aba", m_list->GetString(5)); +#else + CPPUNIT_ASSERT_EQUAL("aaa", m_list->GetString(0)); + CPPUNIT_ASSERT_EQUAL("Aaa", m_list->GetString(1)); + CPPUNIT_ASSERT_EQUAL("AAA", m_list->GetString(2)); + CPPUNIT_ASSERT_EQUAL("aaab", m_list->GetString(3)); + CPPUNIT_ASSERT_EQUAL("aab", m_list->GetString(4)); + CPPUNIT_ASSERT_EQUAL("aba", m_list->GetString(5)); +#endif m_list->Append("a", wxUIntToPtr(1));