whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-enable casting to and from "ASCII" on tst_qstring.cpp 

Turns out that we've had some old unit tests commented out that did not
compile. QString does not have a std::string constructor nor overloads
to many other methods. And std::string does not cast to char* on its
own. So these tests need to be removed.

Change-Id: I22df66fc3ccc68bc2840f2d83747234418e480f5
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
bb10
Thiago Macieira 2012-04-25 13:33:03 +02:00 committed by Qt by Nokia
parent da2c170aa2
commit 1fc28ff56c
1 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tests/auto/corelib/tools/qstring/tst_qstring.cpp
View File

@ -39,6 +39,16 @@
**
****************************************************************************/
#ifdef QT_NO_CAST_FROM_ASCII
# undef QT_NO_CAST_FROM_ASCII
#endif
#ifdef QT_NO_CAST_TO_ASCII
# undef QT_NO_CAST_TO_ASCII
#endif
#ifdef QT_ASCII_CAST_WARNINGS
# undef QT_ASCII_CAST_WARNINGS
#endif
#include <QtTest/QtTest>
#include <qregexp.h>
#include <qregularexpression.h>
@ -885,41 +895,11 @@ void tst_QString::constructorQByteArray()
void tst_QString::STL()
{
#ifndef QT_NO_CAST_TO_ASCII
QString qt( "QString" );
std::string stdstr( "QString" );
QString stlqt;
// constructor
stlqt = QString( stdstr );
QCOMPARE( stlqt, qt );
// assignment
stlqt = stdstr;
QCOMPARE( stlqt, qt );
std::string stdstr2 = stlqt;
QCOMPARE( stdstr2, stdstr );
// prepend
stlqt = QString();
stlqt.prepend( stdstr );
QCOMPARE( stlqt, qt );
// append
stlqt = QString();
stlqt.append( stdstr );
QCOMPARE( stlqt, qt );
// pathologics (null-strings not supported by many STLs, so test only empty strings)
stdstr = std::string();
stlqt = stdstr;
QVERIFY( stlqt.isEmpty() );
std::string stdstr3 = stlqt;
QVERIFY( !stdstr3.length() );
#endif
QString stlqt = QString::fromStdString(stdstr);
QCOMPARE(stlqt, QString::fromLatin1(stdstr.c_str()));
QCOMPARE(stlqt.toStdString(), stdstr);
const wchar_t arr[] = {'h', 'e', 'l', 'l', 'o', 0};
std::wstring stlStr = arr;