From 6c9230322afb237e7369bda8a5a4e1f70d685072 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 16 Apr 2017 16:42:36 +0200 Subject: [PATCH] circuit is required, use __FILE__ instead of "inline" --- src/lib/ebus/test/test_data.cpp | 6 +++--- src/lib/ebus/test/test_message.cpp | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/lib/ebus/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp index eb155f6f..1daa298c 100644 --- a/src/lib/ebus/test/test_data.cpp +++ b/src/lib/ebus/test/test_data.cpp @@ -508,7 +508,7 @@ int main() { istringstream dummystr("#"); string errorDescription; vector row; - templates->readLineFromStream(dummystr, errorDescription, "inline", lineNo, row); + templates->readLineFromStream(dummystr, errorDescription, __FILE__, lineNo, row); const DataField* fields = NULL; for (size_t i = 0; i < sizeof(checks) / sizeof(checks[0]); i++) { string check[5] = checks[i]; @@ -558,7 +558,7 @@ int main() { } if (isTemplate) { lineNo = baseLine + i; - result = templates->readLineFromStream(isstr, errorDescription, "inline", lineNo, row, false); + result = templates->readLineFromStream(isstr, errorDescription, __FILE__, lineNo, row, false); if (result != RESULT_OK) { cout << "\"" << check[0] << "\": template read error: " << getResultCode(result) << ", " << errorDescription << endl; @@ -570,7 +570,7 @@ int main() { lineNo = 0; dummystr.clear(); dummystr.str("#"); - result = reader.readLineFromStream(dummystr, errorDescription, "inline", lineNo, row); + result = reader.readLineFromStream(dummystr, errorDescription, __FILE__, lineNo, row); if (result != RESULT_OK) { cout << "\"" << check[0] << "\": reader header error: " << getResultCode(result) << ", " << errorDescription << endl; diff --git a/src/lib/ebus/test/test_message.cpp b/src/lib/ebus/test/test_message.cpp index 6b3abadc..eee515f8 100644 --- a/src/lib/ebus/test/test_message.cpp +++ b/src/lib/ebus/test/test_message.cpp @@ -82,21 +82,21 @@ int main() { {"pumpstate,UCH,0=off;1=on;2=overrun,,Pumpenstatus", "", "", "", "template"}, {"tempsensor,temp;sensor,,Temperatursensor", "", "", "", "template"}, {"tempsensorc,temp;sensorc,,Temperatursensor", "", "", "", "template"}, - {"r,,Status01,VL/RL/AussenTemp/VLWW/SpeicherTemp/Status,,08,B511,01,,,temp1;temp1;temp2;temp1;temp1;pumpstate", "28.0;24.0;4.938;35.0;41.0;4", "ff08b5110101", "093830f00446520400ff", "d"}, + {"r,cir,Status01,VL/RL/AussenTemp/VLWW/SpeicherTemp/Status,,08,B511,01,,,temp1;temp1;temp2;temp1;temp1;pumpstate", "28.0;24.0;4.938;35.0;41.0;4", "ff08b5110101", "093830f00446520400ff", "d"}, {"r,message circuit,message name,message comment,,25,B509,0d2800,,,tempsensor", "temp=-14.00 Temperatursensor [Temperatur];sensor=ok [Fühlerstatus]", "ff25b509030d2800", "0320ff00", "D"}, {"r,message circuit,message name,message comment,,25,B509,0d2800,,,tempsensor,,field unit,field comment", "temp=-14.00 field unit [field comment];sensor=ok [Fühlerstatus]", "ff25b509030d2800", "0320ff00", "D"}, {"r,message circuit,message name,message comment,,25,B509,0d2800,,,tempsensor,,field unit,field comment", "\n \"temp\": {\"value\": -14.00},\n \"sensor\": {\"value\": \"ok\"}", "ff25b509030d2800", "0320ff00", "j"}, {"r,message circuit,message name,message comment,,25,B509,0d2800,,,tempsensor,,field unit,field comment", "\n \"temp\": {\"value\": -14.00, \"unit\": \"field unit\", \"comment\": \"field comment\"},\n" " \"sensor\": {\"value\": \"ok\", \"comment\": \"Fühlerstatus\"}", "ff25b509030d2800", "0320ff00", "J"}, {"r,message circuit,message name,message comment,,25,B509,0d2800,,,temp,,field unit,field comment,,,sensor", "temp=-14.00 field unit [field comment];sensor=ok [Fühlerstatus]", "ff25b509030d2800", "0320ff00", "D"}, {"r,message circuit,message name,message comment,,25,B509,0d2800,,,D2C,,°C,Temperatur,,,sensor", "\n \"0\": {\"name\": \"\", \"value\": -14.00},\n \"1\": {\"name\": \"sensor\", \"value\": \"ok\"}", "ff25b509030d2800", "0320ff00", "j"}, - {"r,,name,,,25,B509,0d2800,,,tempsensorc", "-14.00", "ff25b509030d2800", "0320ff55", ""}, - {"r,,name,,,25,B509,0d28,,m,sensorc,,,,,,temp", "-14.00", "ff25b509030d2855", "0220ff", ""}, - {"u,,first,,,fe,0700,,x,,bda", "26.10.2014", "fffe07000426100614", "00", "p"}, + {"r,cir,name,,,25,B509,0d2800,,,tempsensorc", "-14.00", "ff25b509030d2800", "0320ff55", ""}, + {"r,cir,name,,,25,B509,0d28,,m,sensorc,,,,,,temp", "-14.00", "ff25b509030d2855", "0220ff", ""}, + {"u,cir,first,,,fe,0700,,x,,bda", "26.10.2014", "fffe07000426100614", "00", "p"}, {"u,broadcast,hwStatus,,,fe,b505,27,,,UCH,,,,,,UCH,,,,,,UCH,,,", "0;19;0", "10feb505042700130097", "00", ""}, - {"w,,first,,,15,b509,0400,date,,bda", "26.10.2014", "ff15b50906040026100614", "00", ""}, - {"w,,first,,,15,b509", "", "ff15b50900", "00", ""}, + {"w,cir,first,,,15,b509,0400,date,,bda", "26.10.2014", "ff15b50906040026100614", "00", ""}, + {"w,cir,first,,,15,b509", "", "ff15b50900", "00", ""}, {"*w,,,,,,b505,2d", "", "", "", ""}, - {"w,,offset,,,50,,,,,temp", "0.50", "ff50b505042d080000", "00", "kd"}, + {"w,cir,offset,,,50,,,,,temp", "0.50", "ff50b505042d080000", "00", "kd"}, {"r,ehp,time,,,08,b509,0d2800,,,time", "15:00:17", "ff08b509030d2800", "0311000f", "d"}, {"r,ehp,time,,,08;10,b509,0d2800,,,time", "", "", "", "c"}, {"r,ehp,time,,,08;09,b509,0d2800,,,time", "15:00:17", "ff08b509030d2800", "0311000f", "d*"}, @@ -147,12 +147,12 @@ int main() { istringstream dummystr("#"); string errorDescription; vector row; - templates->readLineFromStream(dummystr, errorDescription, "inline", lineNo, row, false); + templates->readLineFromStream(dummystr, errorDescription, __FILE__, lineNo, row, false); lineNo = 0; MessageMap* messages = new MessageMap(); dummystr.clear(); dummystr.str("#"); - messages->readLineFromStream(dummystr, errorDescription, "inline", lineNo, row, false); + messages->readLineFromStream(dummystr, errorDescription, __FILE__, lineNo, row, false); vector< vector > defaultsRows; Message* message = NULL; vector mstrs; @@ -183,7 +183,7 @@ int main() { lineNo = baseLine + i; cout << "line " << (lineNo+1) << " "; if (isTemplate) { - result = templates->readLineFromStream(isstr, errorDescription, "inline", lineNo, row); + result = templates->readLineFromStream(isstr, errorDescription, __FILE__, lineNo, row); if (result != RESULT_OK) { cout << "\"" << check[0] << "\": template read error: " << getResultCode(result) << ", " << errorDescription << endl; @@ -197,7 +197,7 @@ int main() { } if (isstr.peek() == '*') { // store defaults or condition - result = messages->readLineFromStream(isstr, errorDescription, "inline", lineNo, row); + result = messages->readLineFromStream(isstr, errorDescription, __FILE__, lineNo, row); if (result != RESULT_OK) { cout << "\"" << check[0] << "\": default read error: " << getResultCode(result) << ", " << errorDescription << endl; error = true; @@ -279,7 +279,7 @@ int main() { } cout << "\"" << check[2] << "\": find OK" << endl; } else { - result = messages->readLineFromStream(isstr, errorDescription, "inline", lineNo, row); + result = messages->readLineFromStream(isstr, errorDescription, __FILE__, lineNo, row); if (failedCreate) { if (result == RESULT_OK) { cout << "\"" << check[0] << "\": failed create error: unexpectedly succeeded" << endl;