Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Add root to images search path, readImageFile svg; unit tests

Browse Source
This commit is contained in:
gitlost
2019-08-21 15:04:52 +01:00
parent 2444cacb74
commit 010879fa71
16 changed files with 1034 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/unit_tests/TestModel.cpp
+21
View File
@@ -318,6 +318,19 @@ void TestModel::saveRestore()
QCOMPARE( model->merge(), merge );
QVERIFY( model->isModified() );
//
// Add some variables
//
model->clearModified();
QVERIFY( !model->isModified() );
Variable i( Variable::Type::INTEGER, "i", "2", Variable::Increment::PER_ITEM, "2" );
Variable f( Variable::Type::FLOATING_POINT, "f", "6.54", Variable::Increment::PER_COPY, "0.12" );
model->variables()->addVariable( i );
QVERIFY( model->isModified() );
model->variables()->addVariable( f );
QVERIFY( model->isModified() );
model->clearModified();
QVERIFY( !model->isModified() );
@@ -361,6 +374,7 @@ void TestModel::saveRestore()
Model* saved = model->save();
QVERIFY( saved->isModified() );
QCOMPARE( saved->merge(), model->merge() ); // Shared
QCOMPARE( saved->variables(), model->variables() ); // Shared
QCOMPARE( saved->isModified(), model->isModified() );
QCOMPARE( saved->shortName(), modelShortName );
QCOMPARE( saved->shortName(), model->shortName() );
@@ -410,6 +424,10 @@ void TestModel::saveRestore()
Model* modified = model->save();
QCOMPARE( modified->merge(), merge2 ); // Shared
Variable c( Variable::Type::COLOR, "c", "blue", Variable::Increment::PER_PAGE );
model->variables()->addVariable( c );
QCOMPARE( model->variables(), saved->variables() ); // Shared.
// Verify differences
QVERIFY( model->shortName() != modelShortName );
QVERIFY( model->shortName() != saved->shortName() );
@@ -442,6 +460,7 @@ void TestModel::saveRestore()
QCOMPARE( model->merge(), merge2 ); // Unchanged
QVERIFY( model->merge() != saved->merge() ); // NOTE saved->merge() now points to deleted object
QCOMPARE( model->variables(), saved->variables() ); // Unchanged
// Unrestore
model->restore( modified );
@@ -457,6 +476,7 @@ void TestModel::saveRestore()
QVERIFY( model->objectList().at(0)->x0() != saved->objectList().at(0)->x0() );
QVERIFY( model->objectList().at(0)->y0() != saved->objectList().at(0)->y0() );
QCOMPARE( model->merge(), merge2 ); // Same
QCOMPARE( model->variables(), saved->variables() ); // Same
QCOMPARE( model->shortName(), modified->shortName() );
QCOMPARE( model->fileName(), modified->fileName() );
@@ -469,6 +489,7 @@ void TestModel::saveRestore()
QCOMPARE( model->objectList().at(0)->y0(), modified->objectList().at(0)->y0() );
delete model->merge(); // Final instance owned by us
delete model->variables(); // Instance owned by us
delete model;
delete saved;
delete modified;