diff --git a/tests/executables_src/testTrigger.cc b/tests/executables_src/testTrigger.cc index 10925f57dc8fcd3c8f6bb7817ba643f833000cc4..892bb1758ce43a7a8545fa642a44d1d85da2f228 100644 --- a/tests/executables_src/testTrigger.cc +++ b/tests/executables_src/testTrigger.cc @@ -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(); }