From 75eb227ade8109b7718cacb8c966043ceff805e6 Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 22 Nov 2014 08:44:24 +0100 Subject: [PATCH] added test for set, better error messages --- src/lib/ebus/test/test_data.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/lib/ebus/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp index 62058b68..f100e632 100644 --- a/src/lib/ebus/test/test_data.cpp +++ b/src/lib/ebus/test/test_data.cpp @@ -84,11 +84,15 @@ int main() {"x;;bcd", "99", "10feffff0199", "00", ""}, {"x;;bcd", "-", "10feffff01ff", "00", ""}, {"x;;bcd", "", "10feffff019a", "00", "rw"}, - {"x;16;uch", "15", "10feffff11000102030405060708090a0b0c0d0e0f10", "00", "W"}, + {"x;16;uch", "15", "10feffff11000102030405060708090a0b0c0d0e0f10", "00", "W"}, {"x;17;uch", "", "10feffff00", "00", "c"}, - {"x;s3;uch", "2", "1025ffff0310111213", "0300010203", "W"}, - {"x;s3;uch", "2", "1025ffff00", "00000002", ""}, - {"x;s3;uch;;;;y;m2;uch", "2;3","1025ffff020003", "00000002", ""}, + {"x;s3;uch", "2", "1025ffff0310111213", "0300010203", "W"}, + {"x;s3;uch", "2", "1025ffff00", "03000002", ""}, + {"x;3;uch", "2", "1025ffff03010101", "03000002", "W"}, + {"x;3;uch", "1", "1025ffff03010101", "03000002", "sW"}, + {"x;1;uch", "2", "1025ffff00", "0102", ""}, + {"x;1;uch", "1", "1025ffff0101", "00", "s"}, + {"x;s3;uch;;;;y;m2;uch", "2;3","1025ffff020003", "03000002", ""}, {"x;;uch", "38", "10feffff0126", "00", ""}, {"x;;uch", "0", "10feffff0100", "00", ""}, {"x;;uch", "254", "10feffff01fe", "00", ""}, @@ -225,17 +229,18 @@ int main() else std::cout << "\"" << check[0] << "\": failed create OK" << std::endl; continue; - } else if (result != RESULT_OK) { + } + if (result != RESULT_OK) { std::cout << "\"" << check[0] << "\": create error: " << getResultCode(result) << std::endl; continue; } if (fields == NULL) { - std::cout << "\"" << check[0] << "\": create error: empty" << std::endl; + std::cout << "\"" << check[0] << "\": create error: NULL" << std::endl; continue; } if (it != entries.end()) { - std::cout << "\"" << check[0] << "\": create error: non-empty" << std::endl; + std::cout << "\"" << check[0] << "\": create error: trailing input" << std::endl; continue; } std::cout << "\"" << check[0] << "\": create OK" << std::endl;