UserVariables branch merge
This commit is contained in:
@@ -45,6 +45,7 @@ void TestColorNode::colorNode()
|
||||
QColor white = QColor::fromRgba( rgbaWhite );
|
||||
QColor red = QColor::fromRgba( qRgbaRed );
|
||||
QColor green80 = QColor::fromRgba( qRgbaGreen80 );
|
||||
QColor silver80 = QColor( 192, 192, 192, 128 );
|
||||
|
||||
Record record;
|
||||
|
||||
@@ -53,8 +54,8 @@ void TestColorNode::colorNode()
|
||||
QCOMPARE( colorNode.color(), blackTransparent );
|
||||
QCOMPARE( colorNode.key(), QString( "" ) );
|
||||
QCOMPARE( colorNode.rgba(), rgbaBlackTransparent );
|
||||
QCOMPARE( colorNode.color( nullptr ), blackTransparent );
|
||||
QCOMPARE( colorNode.color( &record ), blackTransparent );
|
||||
QCOMPARE( colorNode.color( nullptr, nullptr ), blackTransparent );
|
||||
QCOMPARE( colorNode.color( &record, nullptr ), blackTransparent );
|
||||
|
||||
colorNode.setField( true );
|
||||
QVERIFY( colorNode.isField() );
|
||||
@@ -64,8 +65,8 @@ void TestColorNode::colorNode()
|
||||
colorNode.setColor( white );
|
||||
QCOMPARE( colorNode.color(), white );
|
||||
QCOMPARE( colorNode.rgba(), rgbaWhite );
|
||||
QCOMPARE( colorNode.color( nullptr ), white );
|
||||
QCOMPARE( colorNode.color( &record ), white );
|
||||
QCOMPARE( colorNode.color( nullptr, nullptr ), white );
|
||||
QCOMPARE( colorNode.color( &record, nullptr ), white );
|
||||
|
||||
colorNode.setKey( "key1" );
|
||||
QCOMPARE( colorNode.key(), QString( "key1" ) );
|
||||
@@ -102,28 +103,28 @@ void TestColorNode::colorNode()
|
||||
QVERIFY( colorNode.isField() ); // Defaults to true if given key only
|
||||
QCOMPARE( colorNode.key(), QString( "key1" ) );
|
||||
QCOMPARE( colorNode.color(), blackTransparent );
|
||||
QCOMPARE( colorNode.color( &record ), blackTransparent );
|
||||
QCOMPARE( colorNode.color( &record, nullptr ), silver80 ); // Defaults to silver if given non-matching record/variables
|
||||
|
||||
///
|
||||
/// Record
|
||||
///
|
||||
record["key1"] = "white";
|
||||
QCOMPARE( colorNode.color( &record ), white );
|
||||
QCOMPARE( colorNode.color( &record, nullptr ), white );
|
||||
|
||||
record["key1"] = "red";
|
||||
QCOMPARE( colorNode.color( &record ), red );
|
||||
QCOMPARE( colorNode.color( &record, nullptr ), red );
|
||||
|
||||
record["key1"] = "#FF0000";
|
||||
QCOMPARE( colorNode.color( &record ), red );
|
||||
QCOMPARE( colorNode.color( &record, nullptr ), red );
|
||||
|
||||
record["key1"] = "#FFFF0000"; // ARGB
|
||||
QCOMPARE( colorNode.color( &record ), red );
|
||||
QCOMPARE( colorNode.color( &record, nullptr ), red );
|
||||
|
||||
record["key1"] = "#8000FF00";
|
||||
QCOMPARE( colorNode.color( &record ), green80 );
|
||||
QCOMPARE( colorNode.color( &record, nullptr ), green80 );
|
||||
|
||||
colorNode.setKey( "key2" );
|
||||
QCOMPARE( colorNode.color( &record ), blackTransparent );
|
||||
QCOMPARE( colorNode.color( &record, nullptr ), silver80 );
|
||||
record["key2"] = "#8000FF00";
|
||||
QCOMPARE( colorNode.color( &record ), green80 );
|
||||
QCOMPARE( colorNode.color( &record, nullptr ), green80 );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user