uni-days/iFacilityProject
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed test due to changes in 9bdce6a

Browse source
This commit is contained in:
E. Kozlovskaya 2021-01-04 00:20:05 +07:00
parent 9bdce6a96b
commit 0871eaad37
2 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
iFacilityTests/iFacilityTests.pro
View file

@ -7,8 +7,10 @@ CONFIG -= app_bundle
TEMPLATE = app TEMPLATE = app
SOURCES += tst_ifacilitytest.cpp \ SOURCES += tst_ifacilitytest.cpp \
..\iFacility\objects\userprofession.cpp \
..\iFacility\objects\profession.cpp \ ..\iFacility\objects\profession.cpp \
..\iFacility\objects\user.cpp ..\iFacility\objects\user.cpp
HEADERS += ..\iFacility\objects\profession.h \ HEADERS += ..\iFacility\objects\userprofession.h \
..\iFacility\objects\profession.h \
..\iFacility\objects\user.h ..\iFacility\objects\user.h

33
iFacilityTests/tst_ifacilitytest.cpp
View file

@ -3,6 +3,7 @@
#include <QByteArray> #include <QByteArray>
#include <QDataStream> #include <QDataStream>
#include "../iFacility/objects/userprofession.h"
#include "../iFacility/objects/profession.h" #include "../iFacility/objects/profession.h"
#include "../iFacility/objects/user.h" #include "../iFacility/objects/user.h"
@ -33,18 +34,18 @@ void iFacilityTest::test_user_add_profession() {
auto p4 = Profession::createProfession("test4"); auto p4 = Profession::createProfession("test4");
auto p5 = Profession::createProfession("test5"); auto p5 = Profession::createProfession("test5");
u.addProfession(p1); u.addProfession(p1, 2);
QVERIFY(u.getProfessions().size() == 1); QVERIFY(u.getProfessions().size() == 1);
u.addProfession(p1); u.addProfession(p1, 2);
QVERIFY(u.getProfessions().size() == 1); QVERIFY(u.getProfessions().size() == 1);
u.addProfession(p2); u.addProfession(p2, 2);
u.addProfession(p3); u.addProfession(p3, 2);
u.addProfession(p4); u.addProfession(p4, 2);
u.addProfession(p5); u.addProfession(p5, 2);
QVERIFY(u.getProfessions().front() == p2.pID()); QVERIFY(u.getProfessions().front().getProfession() == p2.pID());
QVERIFY(u.getProfessions().back() == p5.pID()); QVERIFY(u.getProfessions().back().getProfession() == p5.pID());
} }
void iFacilityTest::test_user_remove_profession() { void iFacilityTest::test_user_remove_profession() {
@ -52,10 +53,10 @@ void iFacilityTest::test_user_remove_profession() {
auto p1 = Profession::createProfession("test1"); auto p1 = Profession::createProfession("test1");
u.addProfession(p1); u.addProfession(p1, 2);
QVERIFY(u.getProfessions().size() == 1); QVERIFY(u.getProfessions().size() == 1);
u.removeProfession(p1); u.removeProfession(p1.pID());
QVERIFY(u.getProfessions().isEmpty()); QVERIFY(u.getProfessions().isEmpty());
} }
@ -65,10 +66,10 @@ void iFacilityTest::test_user_current_profession() {
auto p1 = Profession::createProfession("test1"); auto p1 = Profession::createProfession("test1");
auto p2 = Profession::createProfession("test2"); auto p2 = Profession::createProfession("test2");
u.addProfession(p1); u.addProfession(p1, 2);
QVERIFY(!u.setCurrentProfession(p2)); QVERIFY(!u.setCurrentProfession(p2.pID()));
QVERIFY(u.setCurrentProfession(p1)); QVERIFY(u.setCurrentProfession(p1.pID()));
QVERIFY(u.getCurrentProfession() == p1.pID()); QVERIFY(u.getCurrentProfession() == p1.pID());
} }
@ -82,9 +83,9 @@ void iFacilityTest::test_user_serialization() {
auto p1 = Profession::createProfession("test1"); auto p1 = Profession::createProfession("test1");
auto p2 = Profession::createProfession("test2"); auto p2 = Profession::createProfession("test2");
u1.addProfession(p1); u1.addProfession(p1, 2);
u1.addProfession(p2); u1.addProfession(p2, 2);
u1.setCurrentProfession(p1); u1.setCurrentProfession(p1.pID());
qdsw << u1; qdsw << u1;