nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for new result code empty

Browse Source
This commit is contained in:
john30
2014-12-14 18:55:11 +01:00
parent 5670c05a9a
commit 3a55d7552c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/test/test_data.cpp
+6 -6
View File
@@ -250,17 +250,17 @@ int main()
SymbolString writeMstr(mstr.getDataStr().substr(0, 10), false); SymbolString writeMstr(mstr.getDataStr().substr(0, 10), false);
SymbolString writeSstr(sstr.getDataStr().substr(0, 2), false); SymbolString writeSstr(sstr.getDataStr().substr(0, 2), false);
result = fields->read(pt_masterData, mstr, 0, output, false, verbose); result = fields->read(pt_masterData, mstr, 0, output, false, verbose);
if (result == RESULT_OK) { if (result >= RESULT_OK) {
result = fields->read(pt_slaveData, sstr, 0, output, output.str().empty() == false, verbose); result = fields->read(pt_slaveData, sstr, 0, output, output.str().empty() == false, verbose);
} }
if (failedRead == true) if (failedRead == true)
if (result == RESULT_OK) if (result >= RESULT_OK)
cout << " failed read " << fields->getName() << " >" cout << " failed read " << fields->getName() << " >"
<< check[2] << "< error: unexpectedly succeeded" << endl; << check[2] << "< error: unexpectedly succeeded" << endl;
else else
cout << " failed read " << fields->getName() << " >" cout << " failed read " << fields->getName() << " >"
<< check[2] << "< OK" << endl; << check[2] << "< OK" << endl;
else if (result != RESULT_OK) { else if (result < RESULT_OK) {
cout << " read " << fields->getName() << " >" << check[2] cout << " read " << fields->getName() << " >" << check[2]
<< "< error: " << getResultCode(result) << endl; << "< error: " << getResultCode(result) << endl;
} }
@@ -272,17 +272,17 @@ int main()
if (verbose == false) { if (verbose == false) {
istringstream input(expectStr); istringstream input(expectStr);
result = fields->write(input, pt_masterData, writeMstr, 0); result = fields->write(input, pt_masterData, writeMstr, 0);
if (result == RESULT_OK) if (result >= RESULT_OK)
result = fields->write(input, pt_slaveData, writeSstr, 0); result = fields->write(input, pt_slaveData, writeSstr, 0);
if (failedWrite == true) { if (failedWrite == true) {
if (result == RESULT_OK) if (result >= RESULT_OK)
cout << " failed write " << fields->getName() << " >" cout << " failed write " << fields->getName() << " >"
<< expectStr << "< error: unexpectedly succeeded" << endl; << expectStr << "< error: unexpectedly succeeded" << endl;
else else
cout << " failed write " << fields->getName() << " >" cout << " failed write " << fields->getName() << " >"
<< expectStr << "< OK" << endl; << expectStr << "< OK" << endl;
} }
else if (result != RESULT_OK) { else if (result < RESULT_OK) {
cout << " write " << fields->getName() << " >" << expectStr cout << " write " << fields->getName() << " >" << expectStr
<< "< error: " << getResultCode(result) << endl; << "< error: " << getResultCode(result) << endl;
} }