@@ -8,28 +8,35 @@ void TestResponse::getValue()
88{
99 // given
1010 Response test;
11- QFETCH (QString, testResponse);
11+ QFETCH (QString, testResponse);
1212 QFETCH (QVariant, validResult);
1313
14- test.setSource (testResponse);
14+ test.setSource (testResponse. toUtf8 () );
1515
1616 // when
1717 QVariant actualResult = test.getValue ();
1818
19+ if (actualResult.type () == QMetaType::QStringList) {
20+ QString str = actualResult.toStringList ().join (" \n " );
21+
22+ str;
23+ }
24+
25+
1926 // then
2027 QCOMPARE (actualResult, validResult);
2128}
2229
2330void TestResponse::getValue_data ()
2431{
25- QTest::addColumn<QString>(" testResponse" );
32+ QTest::addColumn<QString>(" testResponse" );
2633 QTest::addColumn<QVariant>(" validResult" );
2734
28- QTest::newRow (" Status" ) << " +OK\r\n " << QVariant (QString (" OK" ));
29- QTest::newRow (" Error" ) << " -ERR unknown command 'foobar'\r\n " << QVariant (QString (" ERR unknown command 'foobar'" ));
30- QTest::newRow (" Integer" ) << " :99998\r\n " << QVariant (99998 );
35+ QTest::newRow (" Status" ) << " +OK\r\n " << QVariant (QString (" OK" ));
36+ QTest::newRow (" Error" ) << " -ERR unknown command 'foobar'\r\n " << QVariant (QString (" ERR unknown command 'foobar'" ));
37+ QTest::newRow (" Integer" ) << " :99998\r\n " << QVariant (99998 );
3138 QTest::newRow (" Bulk" ) << " $6\r\n foobar\r\n " << QVariant (" foobar" );
32- QTest::newRow (" Null Bulk" ) << " $-1\r\n " << QVariant ();
39+ QTest::newRow (" Null Bulk" ) << " $-1\r\n " << QVariant (QString () );
3340 QTest::newRow (" Multi Bulk" ) << " *3\r\n :1\r\n :2\r\n $6\r\n foobar\r\n " << QVariant (QStringList () << " 1" << " 2" << " foobar" );
3441 QTest::newRow (" Multi Bulk with empty item" )
3542 << " *6\r\n $6\r\n app_id\r\n $1\r\n 0\r\n $7\r\n keyword\r\n $0\r\n\r\n $3\r\n url\r\n $5\r\n nourl\r\n "
@@ -39,19 +46,19 @@ void TestResponse::getValue_data()
3946 << QVariant (QStringList () << " app_id" << " 0" << " keyword" << " " << " url" << " n\r\n rl" );
4047
4148 QTest::newRow (" Multi Bulk with unicode item" )
42- << " *6\r\n $6\r\n app_id\r\n $1\r\n 0\r\n $7\r\n keyword\r\n $6\r\n 快樂\r\n $3 \r\n url \r\n $3 \r\n nourl \r\n "
43- << QVariant (QStringList () << " app_id" << " 0" << " keyword" << " 快樂" << " url " << " nourl " );
49+ << " *6\r\n $6\r\n app_id\r\n $1\r\n 0\r\n $7\r\n keyword\r\n $6\r\n 快樂\r\n "
50+ << QVariant (QStringList () << " app_id" << " 0" << " keyword" << " 快樂" );
4451
4552}
4653
4754
4855void TestResponse::isValid ()
4956{
5057 // given
51- QFETCH (QString, testResponse);
58+ QFETCH (QString, testResponse);
5259 QFETCH (bool , validResult);
5360
54- Response test (testResponse);
61+ Response test (testResponse. toUtf8 ());
5562
5663 // when
5764 bool actualOnValid = test.isValid ();
@@ -63,7 +70,7 @@ void TestResponse::isValid()
6370
6471void TestResponse::isValid_data ()
6572{
66- QTest::addColumn<QString>(" testResponse" );
73+ QTest::addColumn<QString>(" testResponse" );
6774 QTest::addColumn<bool >(" validResult" );
6875
6976 // test int
0 commit comments