|
@@ -199,7 +199,7 @@ TEST_F(SimpleTest, SimpleStringMessageTest)
|
|
|
const char *propertyName = "testFieldString";
|
|
|
SimpleStringMessage test;
|
|
|
int propertyNumber = SimpleStringMessage::propertyOrdering.at(6); //See simpletest.proto
|
|
|
- ASSERT_EQ(SimpleStringMessage::staticMetaObject.property(propertyNumber).type(), QMetaType::QString);
|
|
|
+ ASSERT_EQ(SimpleStringMessage::staticMetaObject.property(propertyNumber).metaType(), QMetaType(QMetaType::QString));
|
|
|
ASSERT_STREQ(SimpleStringMessage::staticMetaObject.property(propertyNumber).name(), propertyName);
|
|
|
ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue(QString("test1"))));
|
|
|
ASSERT_STREQ(test.property(propertyName).toString().toStdString().c_str(), "test1");
|
|
@@ -213,7 +213,7 @@ TEST_F(SimpleTest, SimpleFloatMessageTest)
|
|
|
const char *propertyName = "testFieldFloat";
|
|
|
SimpleFloatMessage test;
|
|
|
int propertyNumber = SimpleFloatMessage::propertyOrdering.at(7); //See simpletest.proto
|
|
|
- ASSERT_EQ(SimpleFloatMessage::staticMetaObject.property(propertyNumber).type(), QMetaType::Float);
|
|
|
+ ASSERT_EQ(SimpleFloatMessage::staticMetaObject.property(propertyNumber).metaType(), QMetaType(QMetaType::Float));
|
|
|
ASSERT_STREQ(SimpleFloatMessage::staticMetaObject.property(propertyNumber).name(), "testFieldFloat");
|
|
|
|
|
|
float assignedValue = 1.55f;
|
|
@@ -229,7 +229,7 @@ TEST_F(SimpleTest, SimpleDoubleMessageTest)
|
|
|
const char *propertyName = "testFieldDouble";
|
|
|
SimpleDoubleMessage test;
|
|
|
int propertyNumber = SimpleDoubleMessage::propertyOrdering.at(8); //See simpletest.proto
|
|
|
- ASSERT_EQ(SimpleDoubleMessage::staticMetaObject.property(propertyNumber).type(), QMetaType::Double);
|
|
|
+ ASSERT_EQ(SimpleDoubleMessage::staticMetaObject.property(propertyNumber).metaType(), QMetaType(QMetaType::Double));
|
|
|
ASSERT_STREQ(SimpleDoubleMessage::staticMetaObject.property(propertyNumber).name(), propertyName);
|
|
|
|
|
|
double assignedValue = 0.55;
|
|
@@ -369,7 +369,7 @@ TEST_F(SimpleTest, SimpleBytesMessageTest)
|
|
|
const char *propertyName = "testFieldBytes";
|
|
|
SimpleBytesMessage test;
|
|
|
int propertyNumber = SimpleBytesMessage::propertyOrdering.at(1); //See simpletest.proto
|
|
|
- ASSERT_EQ(SimpleBytesMessage::staticMetaObject.property(propertyNumber).type(), QMetaType::QByteArray);
|
|
|
+ ASSERT_EQ(SimpleBytesMessage::staticMetaObject.property(propertyNumber).metaType(), QMetaType(QMetaType::QByteArray));
|
|
|
ASSERT_STREQ(SimpleBytesMessage::staticMetaObject.property(propertyNumber).name(), propertyName);
|
|
|
ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<QByteArray>("\x01\x02\x03\x04\x05")));
|
|
|
ASSERT_TRUE(test.property(propertyName).toByteArray() == QByteArray("\x01\x02\x03\x04\x05"));
|