Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[cpp-qt5] Fix memory leaks in Pet Store client sample #270

Merged
merged 1 commit into from
Jul 8, 2018
Merged

[cpp-qt5] Fix memory leaks in Pet Store client sample #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 77 additions & 46 deletions samples/client/petstore/cpp-qt5/PetStore/PetApiTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PetApiTests::~PetApiTests () {
}

OAIPetApi* PetApiTests::getApi() {
OAIPetApi* api = new OAIPetApi();
auto api = new OAIPetApi();
api->host = "http://petstore.swagger.io";
api->basePath = "/v2";
return api;
Expand All @@ -21,10 +21,11 @@ OAIPetApi* PetApiTests::getApi() {
OAIPet* PetApiTests::createRandomPet() {
OAIPet* pet = new OAIPet();
qint64 id = QDateTime::currentMSecsSinceEpoch();

pet->setName(new QString("monster"));
pet->getName()->clear();
pet->getName()->append(QString("monster"));
pet->setId(id);
pet->setStatus(new QString("freaky"));
pet->getStatus()->clear();
pet->getStatus()->append(QString("freaky"));

return pet;
}
Expand All @@ -38,46 +39,59 @@ void PetApiTests::runTests() {
void PetApiTests::findPetsByStatusTest() {
OAIPetApi* api = getApi();

static QEventLoop loop;
QEventLoop loop;
QTimer timer;
timer.setInterval(14000);
timer.setSingleShot(true);

auto validator = [](QList<OAIPet*>* pets) {
auto validator = [this](QList<OAIPet*>* pets) {
foreach(OAIPet* pet, *pets) {
QVERIFY(pet->getStatus()->startsWith("available") || pet->getStatus()->startsWith("sold"));
}
emit quit();
};
auto finalizer = [&]() {
loop.quit();
};

connect(this, &PetApiTests::quit, finalizer);
connect(api, &OAIPetApi::findPetsByStatusSignal, this, validator);
connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
connect(&timer, &QTimer::timeout, &loop, finalizer);

QList<QString*>* status = new QList<QString*>();
status->append(new QString("available"));
status->append(new QString("sold"));
auto available = new QString("available");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about:

const QString available = “available “

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will do it in the next update.
I plan to switch to QVariant for all members and lets see. It will be a breaking change but I will make it with the server first.

auto sold = new QString("sold");
status->append(available);
status->append(sold);
api->findPetsByStatus(status);
timer.start();
loop.exec();
QVERIFY2(timer.isActive(), "didn't finish within timeout");
disconnect(this, 0,0,0);
delete api;
delete status;
delete sold;
delete available;
}

void PetApiTests::createAndGetPetTest() {
OAIPetApi* api = getApi();

static QEventLoop loop;
QEventLoop loop;
QTimer timer;
timer.setInterval(14000);
timer.setSingleShot(true);

auto validator = []() {
auto validator = [this]() {
// pet created
loop.quit();
emit quit();
};

auto finalizer = [&]() {
loop.quit();
};
connect(this, &PetApiTests::quit, finalizer);
connect(api, &OAIPetApi::addPetSignal, this, validator);
connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
connect(&timer, &QTimer::timeout, &loop, finalizer);

OAIPet* pet = createRandomPet();
qint64 id = pet->getId();
Expand All @@ -90,39 +104,44 @@ void PetApiTests::createAndGetPetTest() {
timer.setInterval(1000);
timer.setSingleShot(true);

auto getPetValidator = [](OAIPet* pet) {
auto getPetValidator = [this](OAIPet* pet) {
QVERIFY(pet->getId() > 0);
QVERIFY(pet->getStatus()->compare("freaky") == 0);
loop.quit();
emit quit();
};

connect(api, &OAIPetApi::getPetByIdSignal, this, getPetValidator);
connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
connect(&timer, &QTimer::timeout, &loop, finalizer);

api->getPetById(id);
timer.start();
loop.exec();
QVERIFY2(timer.isActive(), "didn't finish within timeout");
disconnect(this, 0,0,0);
delete api;
delete pet;
}

void PetApiTests::updatePetTest() {
static OAIPetApi* api = getApi();
OAIPetApi* api = getApi();

OAIPet* pet = createRandomPet();
static OAIPet* petToCheck;
OAIPet* petToCheck;
qint64 id = pet->getId();
static QEventLoop loop;
QEventLoop loop;
QTimer timer;
timer.setInterval(100000);
timer.setSingleShot(true);

auto validator = []() {
auto validator = [this]() {
emit quit();
};
auto finalizer = [&]() {
loop.quit();
};

connect(this, &PetApiTests::quit, finalizer);
connect(api, &OAIPetApi::addPetSignal, this, validator);
connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
connect(&timer, &QTimer::timeout, &loop, finalizer);

// create pet
api->addPet(*pet);
Expand All @@ -134,12 +153,12 @@ void PetApiTests::updatePetTest() {
timer.setInterval(1000);
timer.setSingleShot(true);

auto fetchPet = [](OAIPet* pet) {
auto fetchPet = [&](OAIPet* pet) {
petToCheck = pet;
loop.quit();
emit quit();
};
connect(api, &OAIPetApi::getPetByIdSignal, this, fetchPet);
connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
connect(&timer, &QTimer::timeout, &loop, finalizer);

// create pet
api->getPetById(id);
Expand All @@ -150,15 +169,16 @@ void PetApiTests::updatePetTest() {
// update it
timer.setInterval(1000);
timer.setSingleShot(true);
auto updatePetTest = []() {
loop.quit();
auto updatePetTest = [this]() {
emit quit();
};

connect(api, &OAIPetApi::updatePetSignal, this, updatePetTest);
connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
connect(&timer, &QTimer::timeout, &loop, finalizer);

// update pet
petToCheck->setStatus(new QString("scary"));
petToCheck->getStatus()->clear();
petToCheck->getStatus()->append(QString("scary"));
api->updatePet(*petToCheck);
timer.start();
loop.exec();
Expand All @@ -168,38 +188,44 @@ void PetApiTests::updatePetTest() {
timer.setInterval(1000);
timer.setSingleShot(true);

auto fetchPet2 = [](OAIPet* pet) {
auto fetchPet2 = [&](OAIPet* pet) {
QVERIFY(pet->getId() == petToCheck->getId());
QVERIFY(pet->getStatus()->compare(petToCheck->getStatus()) == 0);
loop.quit();
emit quit();
};
connect(api, &OAIPetApi::getPetByIdSignal, this, fetchPet2);
connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
connect(&timer, &QTimer::timeout, &loop, finalizer);
api->getPetById(id);
timer.start();
loop.exec();
QVERIFY2(timer.isActive(), "didn't finish within timeout");
disconnect(this, 0,0,0);
delete api;
delete pet;
}

void PetApiTests::updatePetWithFormTest() {
static OAIPetApi* api = getApi();
OAIPetApi* api = getApi();

OAIPet* pet = createRandomPet();
OAIPet* petToCheck;
qint64 id = pet->getId();
static QEventLoop loop;
QEventLoop loop;
QTimer timer;

// create pet
timer.setInterval(1000);
timer.setSingleShot(true);

auto validator = []() {
auto validator = [this ]() {
emit quit();
};
auto finalizer = [&]() {
loop.quit();
};

connect(this, &PetApiTests::quit, finalizer);
connect(api, &OAIPetApi::addPetSignal, this, validator);
connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
connect(&timer, &QTimer::timeout, &loop, finalizer);
api->addPet(*pet);
timer.start();
loop.exec();
Expand All @@ -211,10 +237,10 @@ void PetApiTests::updatePetWithFormTest() {

auto fetchPet = [&](OAIPet* pet) {
petToCheck = pet;
loop.quit();
emit quit();
};
connect(api, &OAIPetApi::getPetByIdSignal, this, fetchPet);
connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
connect(&timer, &QTimer::timeout, &loop, finalizer);

api->getPetById(id);
timer.start();
Expand All @@ -225,10 +251,11 @@ void PetApiTests::updatePetWithFormTest() {
timer.setInterval(1000);
timer.setSingleShot(true);

connect(api, &OAIPetApi::updatePetWithFormSignal, this, [](){loop.quit();});
connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
connect(api, &OAIPetApi::updatePetWithFormSignal, this, [this](){emit quit();});
connect(&timer, &QTimer::timeout, &loop, finalizer);

api->updatePetWithForm(id, new QString("gorilla"), NULL);
auto name = new QString("gorilla");
api->updatePetWithForm(id, name, NULL);
timer.start();
loop.exec();
QVERIFY2(timer.isActive(), "didn't finish within timeout");
Expand All @@ -237,15 +264,19 @@ void PetApiTests::updatePetWithFormTest() {
timer.setInterval(1000);
timer.setSingleShot(true);

auto fetchUpdatedPet = [](OAIPet* pet) {
auto fetchUpdatedPet = [this](OAIPet* pet) {
QVERIFY(pet->getName()->compare(QString("gorilla")) == 0);
loop.quit();
emit quit();
};
connect(api, &OAIPetApi::getPetByIdSignal, this, fetchUpdatedPet);
connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
connect(&timer, &QTimer::timeout, &loop, finalizer);

api->getPetById(id);
timer.start();
loop.exec();
QVERIFY2(timer.isActive(), "didn't finish within timeout");
disconnect(this, 0,0,0);
delete api;
delete pet;
delete name;
}
4 changes: 0 additions & 4 deletions samples/client/petstore/cpp-qt5/PetStore/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@

int main(int argc, char *argv[]) {
QCoreApplication a(argc, argv);

PetApiTests::runTests();



return a.exec();
}