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

adapted to getTemplates()

Browse Source
This commit is contained in:
john30
2015-11-22 09:46:46 +01:00
parent 856a5ce1d5
commit 0f331694e1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/test/test_message.cpp
+9 -2
View File
@@ -40,6 +40,13 @@ void verify(bool expectFailMatch, string type, string input,
<< gotStr << "<, expected >" << expectStr << "<" << endl; << gotStr << "<, expected >" << expectStr << "<" << endl;
} }
DataFieldTemplates* templates = NULL;
DataFieldTemplates* getTemplates(const string filename)
{
return templates;
}
int main() int main()
{ {
// message: [type],[circuit],name,[comment],[QQ[;QQ]*],[ZZ],[PBSB],[ID],fields... // message: [type],[circuit],name,[comment],[QQ[;QQ]*],[ZZ],[PBSB],[ID],fields...
@@ -84,7 +91,7 @@ int main()
{"r,,x,,,,,\"6800\",,,UCH,,,bit0=\"comment, continued comment", "", "", "", "c"}, {"r,,x,,,,,\"6800\",,,UCH,,,bit0=\"comment, continued comment", "", "", "", "c"},
{"r,,x,,,,,\"6800\",,,UCH,,\"\",\"bit0=\"comment, continued comment\"", "=1 [bit0=\"comment, continued comment]", "ff08b509030d6800", "0101", "mD"}, {"r,,x,,,,,\"6800\",,,UCH,,\"\",\"bit0=\"comment, continued comment\"", "=1 [bit0=\"comment, continued comment]", "ff08b509030d6800", "0101", "mD"},
}; };
DataFieldTemplates* templates = new DataFieldTemplates(); templates = new DataFieldTemplates();
MessageMap* messages = new MessageMap(); MessageMap* messages = new MessageMap();
vector< vector<string> > defaultsRows; vector< vector<string> > defaultsRows;
map<string, Condition*> &conditions = messages->getConditions(); map<string, Condition*> &conditions = messages->getConditions();
@@ -121,7 +128,7 @@ int main()
string item; string item;
vector<string> entries; vector<string> entries;
FileReader<string>::splitFields(check[0], entries); FileReader::splitFields(check[0], entries);
if (deleteMessages.size()>0) { if (deleteMessages.size()>0) {
for (vector<Message*>::iterator it = deleteMessages.begin(); it != deleteMessages.end(); it++) { for (vector<Message*>::iterator it = deleteMessages.begin(); it != deleteMessages.end(); it++) {