diff options
author | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-09-17 13:44:45 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-09-17 16:21:09 +0300 |
commit | 7b6ff93736bad6ddf69734bb115e2ec550bf43fe (patch) | |
tree | 9b1169b902915fcb8f32a377deeb6a1178faae48 /tests/auto/parser | |
parent | 1d6df4ffe806698b28d80eb9f9aa51e03c44dd41 (diff) |
Renamed TableData to QScxmlTableData and ScxmlError to QScxmlError.
Change-Id: I47fce45d787402f615ae200ef60f9226e367e448
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'tests/auto/parser')
-rw-r--r-- | tests/auto/parser/tst_parser.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/parser/tst_parser.cpp b/tests/auto/parser/tst_parser.cpp index f0d6db4..b3604b3 100644 --- a/tests/auto/parser/tst_parser.cpp +++ b/tests/auto/parser/tst_parser.cpp @@ -34,7 +34,7 @@ #include <QtScxml/scxmlparser.h> #include <QtScxml/scxmlstatemachine.h> -Q_DECLARE_METATYPE(Scxml::ScxmlError); +Q_DECLARE_METATYPE(Scxml::QScxmlError); using namespace Scxml; @@ -50,31 +50,31 @@ private Q_SLOTS: void tst_Parser::error_data() { QTest::addColumn<QString>("scxmlFileName"); - QTest::addColumn<QVector<Scxml::ScxmlError> >("expectedErrors"); + QTest::addColumn<QVector<Scxml::QScxmlError> >("expectedErrors"); - QVector<ScxmlError> errors; - errors << ScxmlError(QString(":/tst_parser/test1.scxml"), 5, 46, QString("unknown state 'b' in target")); + QVector<QScxmlError> errors; + errors << QScxmlError(QString(":/tst_parser/test1.scxml"), 5, 46, QString("unknown state 'b' in target")); QTest::newRow("test1") << QString(":/tst_parser/test1.scxml") << errors; - QTest::newRow("namespaces 1") << QStringLiteral(":/tst_parser/namespaces1.scxml") << QVector<ScxmlError>(); + QTest::newRow("namespaces 1") << QStringLiteral(":/tst_parser/namespaces1.scxml") << QVector<QScxmlError>(); } void tst_Parser::error() { QFETCH(QString, scxmlFileName); - QFETCH(QVector<ScxmlError>, expectedErrors); + QFETCH(QVector<QScxmlError>, expectedErrors); StateMachine *stateMachine = StateMachine::fromFile(scxmlFileName); - QVector<ScxmlError> errors = stateMachine->errors(); + QVector<QScxmlError> errors = stateMachine->errors(); if (errors.count() != expectedErrors.count()) { qDebug()<<errors; } QCOMPARE(errors.count(), expectedErrors.count()); for (int i = 0; i < errors.count(); ++i) { - ScxmlError error = errors.at(i); - ScxmlError expectedError = expectedErrors.at(i); + QScxmlError error = errors.at(i); + QScxmlError expectedError = expectedErrors.at(i); QCOMPARE(error.fileName(), expectedError.fileName()); QCOMPARE(error.line(), expectedError.line()); QCOMPARE(error.column(), expectedError.column()); |