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

add another check, better format for read input

Browse Source
This commit is contained in:
john30
2015-03-21 11:26:13 +01:00
parent b011ae375c
commit 428b9342d2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/test/test_data.cpp
+7 -6
View File
@@ -218,6 +218,7 @@ int main()
{"x,,bi3,,,,y,,bi5", "0;0", "10feffff0100", "00", ""}, // bit combination {"x,,bi3,,,,y,,bi5", "0;0", "10feffff0100", "00", ""}, // bit combination
{"x,,bi3,,,,y,,bi7,,,,t,,uch", "0;0;9","10feffff020009", "00", ""}, // bit combination {"x,,bi3,,,,y,,bi7,,,,t,,uch", "0;0;9","10feffff020009", "00", ""}, // bit combination
{"x,,bi6:2,,,,y,,bi0:2,,,,t,,uch", "2;1;9","10feffff03800109", "00", ""}, // bit combination {"x,,bi6:2,,,,y,,bi0:2,,,,t,,uch", "2;1;9","10feffff03800109", "00", ""}, // bit combination
{"x,,BI0;BI1;BI2;BI3;BI4;BI5;BI6;BI7", "0;0;1;0;0;0;0;0","ff75b50900", "0104", ""}, // bits
{"temp,d2b,,°C,Aussentemperatur","","", "", "t"}, // template with relative pos {"temp,d2b,,°C,Aussentemperatur","","", "", "t"}, // template with relative pos
{"x,,temp","18.004","10fe0700020112", "00", ""}, // reference to template {"x,,temp","18.004","10fe0700020112", "00", ""}, // reference to template
{"x,,temp,10","1.8004","10fe0700020112", "00", ""}, // reference to template, valid divider product {"x,,temp,10","1.8004","10fe0700020112", "00", ""}, // reference to template, valid divider product
@@ -318,14 +319,14 @@ int main()
} }
if (failedRead) if (failedRead)
if (result >= RESULT_OK) if (result >= RESULT_OK)
cout << " failed read " << fields->getName() << " >" cout << " failed read " << fields->getName() << " >" << check[2] << " " << check[3]
<< check[2] << "< error: unexpectedly succeeded" << endl; << "< error: unexpectedly succeeded" << endl;
else else
cout << " failed read " << fields->getName() << " >" cout << " failed read " << fields->getName() << " >" << check[2] << " " << check[3]
<< check[2] << "< OK" << endl; << "< OK" << endl;
else if (result < RESULT_OK) { else if (result < RESULT_OK) {
cout << " read " << fields->getName() << " >" << check[2] cout << " read " << fields->getName() << " >" << check[2] << " " << check[3]
<< "< error: " << getResultCode(result) << endl; << "< error: " << getResultCode(result) << endl;
} }
else { else {
bool match = strcasecmp(output.str().c_str(), expectStr.c_str()) == 0; bool match = strcasecmp(output.str().c_str(), expectStr.c_str()) == 0;