summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2014-06-23 20:37:42 +0300
committerGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2014-06-23 20:37:42 +0300
commit7896e1e927392add3c89f8cb251d7753e34db7ec (patch)
treec99c731adfb558a3d244fda3cc6d268149c4f84f /tests
parent9da2b0ed9f13c61cf802df68d5cefbf5aa70c580 (diff)
QGst: make the various internalStructure() methods return a StructureConstPtr
This is a real const Structure pointer, in contrast with const StructurePtr which was just a const QSharedPointer.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/bustest.cpp2
-rw-r--r--tests/auto/eventtest.cpp10
-rw-r--r--tests/auto/messagetest.cpp21
-rw-r--r--tests/auto/querytest.cpp6
4 files changed, 10 insertions, 29 deletions
diff --git a/tests/auto/bustest.cpp b/tests/auto/bustest.cpp
index ba7e131..52c293a 100644
--- a/tests/auto/bustest.cpp
+++ b/tests/auto/bustest.cpp
@@ -67,7 +67,7 @@ void BusTest::messageClosure(const QGst::MessagePtr & msg)
//check if the message is the same we sent from the other thread
QVERIFY(!msg.isNull());
QCOMPARE(msg->type(), QGst::MessageApplication);
- const QGst::StructurePtr s = msg->internalStructure();
+ QGst::StructureConstPtr s = msg->internalStructure();
QCOMPARE(s->name(), QString("test"));
QCOMPARE(s->value("sequence").get<int>(), m_messagesReceived);
diff --git a/tests/auto/eventtest.cpp b/tests/auto/eventtest.cpp
index b6dd42c..1370df7 100644
--- a/tests/auto/eventtest.cpp
+++ b/tests/auto/eventtest.cpp
@@ -44,15 +44,15 @@ private Q_SLOTS:
void EventTest::baseTest()
{
QGst::Structure s("mystructure");
+ s.setValue("myfield", 365);
+
QGst::EventPtr evt = QGst::NavigationEvent::create(s);
QVERIFY(evt->type()==QGst::EventNavigation);
QCOMPARE(evt->typeName(), QString("navigation"));
- QGst::StructurePtr ss = evt->internalStructure();
+ QGst::StructureConstPtr ss = evt->internalStructure();
QVERIFY(ss->isValid());
-
- ss->setValue("myfield", 365);
QCOMPARE(ss->value("myfield").get<int>(), 365);
QVERIFY(evt->timestamp());
@@ -72,7 +72,7 @@ void EventTest::copyTest()
QCOMPARE(evt->type(), evt2->type());
QCOMPARE(evt->timestamp(), evt2->timestamp());
- QGst::StructurePtr ss = evt2->internalStructure();
+ QGst::StructureConstPtr ss = evt2->internalStructure();
QVERIFY(ss->isValid());
QCOMPARE(ss->value("myfield").get<int>(), 365);
}
@@ -162,7 +162,7 @@ void EventTest::navigationTest()
QVERIFY(evt->type()==QGst::EventNavigation);
QCOMPARE(evt->typeName(), QString("navigation"));
- QGst::StructurePtr ss = evt->internalStructure();
+ QGst::StructureConstPtr ss = evt->internalStructure();
QVERIFY(ss->isValid());
QCOMPARE(ss->value("myfield").get<int>(), 365);
}
diff --git a/tests/auto/messagetest.cpp b/tests/auto/messagetest.cpp
index c934fcd..fe9be95 100644
--- a/tests/auto/messagetest.cpp
+++ b/tests/auto/messagetest.cpp
@@ -26,7 +26,6 @@ class MessageTest : public QGstTest
{
Q_OBJECT
private Q_SLOTS:
- void baseTest();
void eosMessageTest();
void errorMessageTest();
void warningMessageTest();
@@ -46,29 +45,15 @@ private Q_SLOTS:
void qosMessageTest();
};
-void MessageTest::baseTest()
-{
- QGst::Structure s("mystructure");
- QGlib::Quark q = QGlib::Quark::fromString("test");
- QGlib::Error err(q, 10, "test error");
- QGst::ErrorMessagePtr msg = QGst::ErrorMessage::create(QGst::ObjectPtr(), err,
- "Test suite error");
-
- QGst::StructurePtr ss = msg->internalStructure();
- QVERIFY(ss->isValid());
- ss->setValue("myfield", 365);
- QCOMPARE(ss->value("myfield").get<int>(), 365);
-
- msg->setSequenceNumber(1456);
- QCOMPARE(msg->sequenceNumber(), 1456U);
-}
-
void MessageTest::eosMessageTest()
{
QGst::EosMessagePtr msg = QGst::EosMessage::create(QGst::ObjectPtr());
QVERIFY(msg->type()==QGst::MessageEos);
QCOMPARE(msg->typeName(), QString("eos"));
+
+ msg->setSequenceNumber(1456);
+ QCOMPARE(msg->sequenceNumber(), 1456U);
}
void MessageTest::errorMessageTest()
diff --git a/tests/auto/querytest.cpp b/tests/auto/querytest.cpp
index ff6f8ff..19c1430 100644
--- a/tests/auto/querytest.cpp
+++ b/tests/auto/querytest.cpp
@@ -36,13 +36,9 @@ private Q_SLOTS:
void QueryTest::baseTest()
{
- QGst::Structure s("mystructure");
QGst::PositionQueryPtr query = QGst::PositionQuery::create(QGst::FormatBytes);
-
- QGst::StructurePtr ss = query->internalStructure();
+ QGst::StructureConstPtr ss = query->internalStructure();
QVERIFY(ss->isValid());
- ss->setValue("myfield", 365);
- QCOMPARE(ss->value("myfield").get<int>(), 365);
}
void QueryTest::positionTest()