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

added CRC check for command line argument, removed unnecessary std:: prefixes

Browse Source
This commit is contained in:
john30
2016-02-27 12:10:55 +01:00
parent 31951c392f
commit a8f08de5bb
1 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/test/test_symbol.cpp
+31 -19
View File
@@ -22,54 +22,66 @@
using namespace std; using namespace std;
int main () int main(int argc, char** argv)
{ {
SymbolString sstr(true); SymbolString sstr(true);
if (argc>1) {
result_t result = sstr.parseHex(argv[1], true);
if (result != RESULT_OK) {
cout << "parse escaped error: " << getResultCode(result) << endl;
} else {
unsigned char gotCrc = sstr.getCRC();
cout << "calculated CRC: 0x"
<< nouppercase << setw(2) << hex << setfill('0')
<< static_cast<unsigned>(gotCrc) << endl;
}
return 0;
}
result_t result = sstr.parseHex("10feb5050427a915aa", false); result_t result = sstr.parseHex("10feb5050427a915aa", false);
if (result != RESULT_OK) if (result != RESULT_OK)
std::cout << "parse escaped error: " << getResultCode(result) << std::endl; cout << "parse escaped error: " << getResultCode(result) << endl;
std::string gotStr = sstr.getDataStr(false, false), expectStr = "10feb5050427a90015a90177"; string gotStr = sstr.getDataStr(false, false), expectStr = "10feb5050427a90015a90177";
if (strcasecmp(gotStr.c_str(), expectStr.c_str()) == 0) if (strcasecmp(gotStr.c_str(), expectStr.c_str()) == 0)
std::cout << "parse escaped OK" << std::endl; cout << "parse escaped OK" << endl;
else else
std::cout << "parse escaped error: got " << gotStr << ", expected " cout << "parse escaped error: got " << gotStr << ", expected "
<< expectStr << std::endl; << expectStr << endl;
unsigned char gotCrc = sstr.getCRC(), expectCrc = 0x77; unsigned char gotCrc = sstr.getCRC(), expectCrc = 0x77;
if (gotCrc == expectCrc) if (gotCrc == expectCrc)
std::cout << "CRC OK" << std::endl; cout << "CRC OK" << endl;
else else
std::cout << "CRC error: got 0x" << std::nouppercase << std::setw(2) cout << "CRC error: got 0x" << nouppercase << setw(2)
<< std::hex << std::setfill('0') << hex << setfill('0')
<< static_cast<unsigned>(gotCrc) << ", expected 0x" << static_cast<unsigned>(gotCrc) << ", expected 0x"
<< std::nouppercase << std::setw(2) << std::hex << nouppercase << setw(2) << hex
<< std::setfill('0') << static_cast<unsigned>(expectCrc) << setfill('0') << static_cast<unsigned>(expectCrc)
<< std::endl; << endl;
gotStr = sstr.getDataStr(true, false), expectStr = "10feb5050427a915aa77"; gotStr = sstr.getDataStr(true, false), expectStr = "10feb5050427a915aa77";
if (strcasecmp(gotStr.c_str(), expectStr.c_str()) == 0) if (strcasecmp(gotStr.c_str(), expectStr.c_str()) == 0)
std::cout << "unescape OK" << std::endl; cout << "unescape OK" << endl;
else else
std::cout << "unescape error: got " << gotStr << ", expected " cout << "unescape error: got " << gotStr << ", expected "
<< expectStr << std::endl; << expectStr << endl;
sstr = SymbolString(false); sstr = SymbolString(false);
result = sstr.parseHex("10feb5050427a90015a90177", true); result = sstr.parseHex("10feb5050427a90015a90177", true);
if (result != RESULT_OK) if (result != RESULT_OK)
std::cout << "parse unescaped error: " << getResultCode(result) << std::endl; cout << "parse unescaped error: " << getResultCode(result) << endl;
gotStr = sstr.getDataStr(true, false); gotStr = sstr.getDataStr(true, false);
if (strcasecmp(gotStr.c_str(), expectStr.c_str()) == 0) if (strcasecmp(gotStr.c_str(), expectStr.c_str()) == 0)
std::cout << "parse unescaped OK" << std::endl; cout << "parse unescaped OK" << endl;
else else
std::cout << "parse unescaped error: got " << gotStr << ", expected " cout << "parse unescaped error: got " << gotStr << ", expected "
<< expectStr << std::endl; << expectStr << endl;
return 0; return 0;