UserVariables branch merge
This commit is contained in:
@@ -42,14 +42,14 @@ void TestRawText::rawText()
|
||||
QVERIFY( !rawText.hasPlaceHolders() );
|
||||
QCOMPARE( rawText.toString(), QString( "" ) );
|
||||
QCOMPARE( rawText.toStdString(), std::string( "" ) );
|
||||
QCOMPARE( rawText.expand( &record ), QString( "" ) );
|
||||
QCOMPARE( rawText.expand( &record, nullptr ), QString( "" ) );
|
||||
|
||||
rawText = "text";
|
||||
QVERIFY( !rawText.isEmpty() );
|
||||
QVERIFY( !rawText.hasPlaceHolders() );
|
||||
QCOMPARE( rawText.toString(), QString( "text" ) );
|
||||
QCOMPARE( rawText.toStdString(), std::string( "text" ) );
|
||||
QCOMPARE( rawText.expand( &record ), QString( "text" ) );
|
||||
QCOMPARE( rawText.expand( &record, nullptr ), QString( "text" ) );
|
||||
|
||||
RawText rawText2( "text" );
|
||||
QVERIFY( !rawText2.isEmpty() );
|
||||
@@ -61,34 +61,34 @@ void TestRawText::rawText()
|
||||
QVERIFY( rawText.hasPlaceHolders() );
|
||||
QCOMPARE( rawText.toString(), QString( "${key1}" ) );
|
||||
QCOMPARE( rawText.toStdString(), std::string( "${key1}" ) );
|
||||
QCOMPARE( rawText.expand( &record ), QString( "" ) );
|
||||
QCOMPARE( rawText.expand( &record, nullptr ), QString( "" ) );
|
||||
|
||||
///
|
||||
/// Record
|
||||
///
|
||||
record["key1"] = "val1";
|
||||
QCOMPARE( rawText.expand( &record ), QString( "val1" ) );
|
||||
QCOMPARE( rawText.expand( &record, nullptr ), QString( "val1" ) );
|
||||
|
||||
rawText = "${key1}${key2}";
|
||||
QVERIFY( rawText.hasPlaceHolders() );
|
||||
QCOMPARE( rawText.expand( &record ), QString( "val1" ) );
|
||||
QCOMPARE( rawText.expand( &record, nullptr ), QString( "val1" ) );
|
||||
|
||||
record["key2"] = "val2";
|
||||
QCOMPARE( rawText.expand( &record ), QString( "val1val2" ) );
|
||||
QCOMPARE( rawText.expand( &record, nullptr ), QString( "val1val2" ) );
|
||||
|
||||
rawText = "${key1}text${key2}";
|
||||
QVERIFY( rawText.hasPlaceHolders() );
|
||||
QCOMPARE( rawText.expand( &record ), QString( "val1textval2" ) );
|
||||
QCOMPARE( rawText.expand( &record, nullptr ), QString( "val1textval2" ) );
|
||||
|
||||
rawText = "text1${key1}text2${key2}text3";
|
||||
QVERIFY( rawText.hasPlaceHolders() );
|
||||
QCOMPARE( rawText.expand( &record ), QString( "text1val1text2val2text3" ) );
|
||||
QCOMPARE( rawText.expand( &record, nullptr ), QString( "text1val1text2val2text3" ) );
|
||||
|
||||
rawText = "${key1}text${key2}${key3}";
|
||||
QVERIFY( rawText.hasPlaceHolders() );
|
||||
QCOMPARE( rawText.expand( &record ), QString( "val1textval2" ) );
|
||||
QCOMPARE( rawText.expand( &record, nullptr ), QString( "val1textval2" ) );
|
||||
|
||||
rawText = "${key2}${key3}${key1}";
|
||||
QVERIFY( rawText.hasPlaceHolders() );
|
||||
QCOMPARE( rawText.expand( &record ), QString( "val2val1" ) );
|
||||
QCOMPARE( rawText.expand( &record, nullptr ), QString( "val2val1" ) );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user