Skip to content
Snippets Groups Projects
Commit 833068e3 authored by Martin Killenberg's avatar Martin Killenberg
Browse files

solved a race condition in testTrigger. Initial value was not considered....

solved a race condition in testTrigger. Initial value was not considered. Still race conditions remaining.
parent 5aefe885
No related branches found
No related tags found
No related merge requests found
......@@ -316,9 +316,12 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(testTriggerTransferGroup, T, test_types) {
dev.write("/REG2", 22);
dev.write("/REG3", 33);
// from the inital value transfer
CHECK_TIMEOUT(backend->numberOfTransfers == 1, 10000);
// trigger the transfer
app.testModule.theTrigger.write();
CHECK_TIMEOUT(backend->numberOfTransfers == 1, 10000);
CHECK_TIMEOUT(backend->numberOfTransfers == 2, 10000);
BOOST_CHECK(backend->last_bar == 0);
BOOST_CHECK(backend->last_address == 0);
BOOST_CHECK(backend->last_sizeInBytes == 12);
......@@ -327,9 +330,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(testTriggerTransferGroup, T, test_types) {
app.testModule.consumingPush.read();
app.testModule.consumingPush2.read();
app.testModule.consumingPush3.read();
BOOST_CHECK(app.testModule.consumingPush == 11);
BOOST_CHECK(app.testModule.consumingPush2 == 22);
BOOST_CHECK(app.testModule.consumingPush3 == 33);
BOOST_CHECK_EQUAL(app.testModule.consumingPush, 11);
BOOST_CHECK_EQUAL(app.testModule.consumingPush2, 22);
BOOST_CHECK_EQUAL(app.testModule.consumingPush3, 33);
// prepare a second transfer
dev.write("/REG1", 12);
......@@ -338,7 +341,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(testTriggerTransferGroup, T, test_types) {
// trigger the transfer
app.testModule.theTrigger.write();
CHECK_TIMEOUT(backend->numberOfTransfers == 2, 10000);
CHECK_TIMEOUT(backend->numberOfTransfers == 3, 10000);
BOOST_CHECK(backend->last_bar == 0);
BOOST_CHECK(backend->last_address == 0);
BOOST_CHECK(backend->last_sizeInBytes == 12);
......@@ -347,9 +350,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(testTriggerTransferGroup, T, test_types) {
app.testModule.consumingPush.read();
app.testModule.consumingPush2.read();
app.testModule.consumingPush3.read();
BOOST_CHECK(app.testModule.consumingPush == 12);
BOOST_CHECK(app.testModule.consumingPush2 == 23);
BOOST_CHECK(app.testModule.consumingPush3 == 34);
BOOST_CHECK_EQUAL(app.testModule.consumingPush, 12);
BOOST_CHECK_EQUAL(app.testModule.consumingPush2, 23);
BOOST_CHECK_EQUAL(app.testModule.consumingPush3, 34);
dev.close();
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment