diff --git a/iFacilityTests/iFacilityTests.pro b/iFacilityTests/iFacilityTests.pro index 18b452e..64f6dce 100644 --- a/iFacilityTests/iFacilityTests.pro +++ b/iFacilityTests/iFacilityTests.pro @@ -7,8 +7,10 @@ CONFIG -= app_bundle TEMPLATE = app SOURCES += tst_ifacilitytest.cpp \ + ..\iFacility\objects\userprofession.cpp \ ..\iFacility\objects\profession.cpp \ ..\iFacility\objects\user.cpp -HEADERS += ..\iFacility\objects\profession.h \ +HEADERS += ..\iFacility\objects\userprofession.h \ + ..\iFacility\objects\profession.h \ ..\iFacility\objects\user.h diff --git a/iFacilityTests/tst_ifacilitytest.cpp b/iFacilityTests/tst_ifacilitytest.cpp index 58a3c12..a73075b 100644 --- a/iFacilityTests/tst_ifacilitytest.cpp +++ b/iFacilityTests/tst_ifacilitytest.cpp @@ -3,6 +3,7 @@ #include #include +#include "../iFacility/objects/userprofession.h" #include "../iFacility/objects/profession.h" #include "../iFacility/objects/user.h" @@ -33,18 +34,18 @@ void iFacilityTest::test_user_add_profession() { auto p4 = Profession::createProfession("test4"); auto p5 = Profession::createProfession("test5"); - u.addProfession(p1); + u.addProfession(p1, 2); QVERIFY(u.getProfessions().size() == 1); - u.addProfession(p1); + u.addProfession(p1, 2); QVERIFY(u.getProfessions().size() == 1); - u.addProfession(p2); - u.addProfession(p3); - u.addProfession(p4); - u.addProfession(p5); - QVERIFY(u.getProfessions().front() == p2.pID()); - QVERIFY(u.getProfessions().back() == p5.pID()); + u.addProfession(p2, 2); + u.addProfession(p3, 2); + u.addProfession(p4, 2); + u.addProfession(p5, 2); + QVERIFY(u.getProfessions().front().getProfession() == p2.pID()); + QVERIFY(u.getProfessions().back().getProfession() == p5.pID()); } void iFacilityTest::test_user_remove_profession() { @@ -52,10 +53,10 @@ void iFacilityTest::test_user_remove_profession() { auto p1 = Profession::createProfession("test1"); - u.addProfession(p1); + u.addProfession(p1, 2); QVERIFY(u.getProfessions().size() == 1); - u.removeProfession(p1); + u.removeProfession(p1.pID()); QVERIFY(u.getProfessions().isEmpty()); } @@ -65,10 +66,10 @@ void iFacilityTest::test_user_current_profession() { auto p1 = Profession::createProfession("test1"); auto p2 = Profession::createProfession("test2"); - u.addProfession(p1); + u.addProfession(p1, 2); - QVERIFY(!u.setCurrentProfession(p2)); - QVERIFY(u.setCurrentProfession(p1)); + QVERIFY(!u.setCurrentProfession(p2.pID())); + QVERIFY(u.setCurrentProfession(p1.pID())); QVERIFY(u.getCurrentProfession() == p1.pID()); } @@ -82,9 +83,9 @@ void iFacilityTest::test_user_serialization() { auto p1 = Profession::createProfession("test1"); auto p2 = Profession::createProfession("test2"); - u1.addProfession(p1); - u1.addProfession(p2); - u1.setCurrentProfession(p1); + u1.addProfession(p1, 2); + u1.addProfession(p2, 2); + u1.setCurrentProfession(p1.pID()); qdsw << u1;