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

Adapted to API change in DOOCS master

- EqCall::get() now returns comp_code, which can be -2, -1, 0 or 1.
  Before it was -1 (error) and 0 (ok).
  Only tests are accected. The library itself did not change.
parent 7e24c26b
No related branches found
No related tags found
No related merge requests found
......@@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(testSpectrum) {
src.set(&par);
EqCall call;
auto rc = call.get(&ea, &src, &dst);
BOOST_CHECK_EQUAL(rc, 0);
BOOST_CHECK_EQUAL(rc, comp_code::ok);
BOOST_CHECK_EQUAL(dst.error(), 0);
expectedFloatArrayValue[1] = i;
for(size_t k = 0; k < expectedFloatArrayValue.size(); ++k) {
......@@ -95,7 +95,7 @@ BOOST_AUTO_TEST_CASE(testSpectrum) {
src.set(&par);
EqCall call;
auto rc = call.get(&ea, &src, &dst);
BOOST_CHECK_EQUAL(rc, 0);
BOOST_CHECK_EQUAL(rc, comp_code::ok);
BOOST_CHECK_EQUAL(dst.error(), 0);
expectedFloatArrayValue[1] = i + 10000;
for(size_t k = 0; k < expectedFloatArrayValue.size(); ++k) {
......@@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE(testSpectrum) {
src.set(&par);
EqCall call;
auto rc = call.get(&ea, &src, &dst);
BOOST_CHECK_EQUAL(rc, -1);
BOOST_CHECK_EQUAL(rc, comp_code::data_error);
BOOST_CHECK_EQUAL(dst.error(), scope_out_of_range);
}
......@@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE(testSpectrum) {
src.set(&par);
EqCall call;
auto rc = call.get(&ea, &src, &dst);
BOOST_CHECK_EQUAL(rc, 0);
BOOST_CHECK_EQUAL(rc, comp_code::ok);
BOOST_CHECK_EQUAL(dst.error(), 0);
expectedFloatArrayValue[1] = i + 10000;
for(size_t k = 0; k < expectedFloatArrayValue.size(); ++k) {
......
......@@ -15,7 +15,6 @@ struct ZmqData {
explicit ZmqData(EqData* d, dmsg_info_t* i) : info(*i) { data.copy_from(d); }
};
extern const char* object_name;
DOOCS_ADAPTER_DEFAULT_FIXTURE_STATIC_APPLICATION_WITH_CODE(dmsg_start();)
......@@ -32,8 +31,8 @@ BOOST_AUTO_TEST_CASE(test_cs_to_app_doocs_scalar) {
// Wait until server is available
EqCall eq;
EqData s, d;
size_t counter=0;
while(eq.get(&ea,&s,&d) != 0) {
size_t counter = 0;
while(eq.get(&ea, &s, &d) != comp_code::ok) {
std::this_thread::sleep_for(std::chrono::seconds(1));
if(++counter > 30) BOOST_FAIL("Timeout in waiting for server");
}
......@@ -60,4 +59,3 @@ BOOST_AUTO_TEST_CASE(test_cs_to_app_doocs_scalar) {
dmsg_detach(&ea, tag);
}
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