diff options
Diffstat (limited to 'test/controls')
| -rw-r--r-- | test/controls/control_info.cpp | 10 | ||||
| -rw-r--r-- | test/controls/control_list.cpp | 16 | ||||
| -rw-r--r-- | test/controls/control_value.cpp | 6 |
3 files changed, 17 insertions, 15 deletions
diff --git a/test/controls/control_info.cpp b/test/controls/control_info.cpp index faefaaa4..2aba568a 100644 --- a/test/controls/control_info.cpp +++ b/test/controls/control_info.cpp @@ -26,13 +26,14 @@ protected: ControlInfo info(Brightness); if (info.id() != Brightness || - info.type() != ControlTypeInteger || + info.type() != ControlTypeInteger32 || info.name() != std::string("Brightness")) { cout << "Invalid control identification for Brightness" << endl; return TestFail; } - if (info.min().get<int>() != 0 || info.max().get<int>() != 0) { + if (info.min().get<int32_t>() != 0 || + info.max().get<int32_t>() != 0) { cout << "Invalid control range for Brightness" << endl; return TestFail; } @@ -44,13 +45,14 @@ protected: info = ControlInfo(Contrast, 10, 200); if (info.id() != Contrast || - info.type() != ControlTypeInteger || + info.type() != ControlTypeInteger32 || info.name() != std::string("Contrast")) { cout << "Invalid control identification for Contrast" << endl; return TestFail; } - if (info.min().get<int>() != 10 || info.max().get<int>() != 200) { + if (info.min().get<int32_t>() != 10 || + info.max().get<int32_t>() != 200) { cout << "Invalid control range for Contrast" << endl; return TestFail; } diff --git a/test/controls/control_list.cpp b/test/controls/control_list.cpp index 0402e7c2..5215840b 100644 --- a/test/controls/control_list.cpp +++ b/test/controls/control_list.cpp @@ -96,7 +96,7 @@ protected: return TestFail; } - if (list[Brightness].get<int>() != 255) { + if (list[Brightness].get<int32_t>() != 255) { cout << "Incorrest Brightness control value" << endl; return TestFail; } @@ -125,8 +125,8 @@ protected: /* * Test control value retrieval and update through ControlInfo. */ - if (list[brightness].get<int>() != 64 || - list[contrast].get<int>() != 128) { + if (list[brightness].get<int32_t>() != 64 || + list[contrast].get<int32_t>() != 128) { cout << "Failed to retrieve control value" << endl; return TestFail; } @@ -134,8 +134,8 @@ protected: list[brightness] = 10; list[contrast] = 20; - if (list[brightness].get<int>() != 10 || - list[contrast].get<int>() != 20) { + if (list[brightness].get<int32_t>() != 10 || + list[contrast].get<int32_t>() != 20) { cout << "Failed to update control value" << endl; return TestFail; } @@ -185,9 +185,9 @@ protected: return TestFail; } - if (newList[Brightness].get<int>() != 10 || - newList[Contrast].get<int>() != 20 || - newList[Saturation].get<int>() != 255) { + if (newList[Brightness].get<int32_t>() != 10 || + newList[Contrast].get<int32_t>() != 20 || + newList[Saturation].get<int32_t>() != 255) { cout << "New list contains incorrect values" << endl; return TestFail; } diff --git a/test/controls/control_value.cpp b/test/controls/control_value.cpp index 397c43f7..a1ffa842 100644 --- a/test/controls/control_value.cpp +++ b/test/controls/control_value.cpp @@ -27,7 +27,7 @@ protected: << " Bool: " << boolean.toString() << endl; - if (integer.get<int>() != 1234) { + if (integer.get<int32_t>() != 1234) { cerr << "Failed to get Integer" << endl; return TestFail; } @@ -56,8 +56,8 @@ protected: return TestFail; } - value.set<int>(10); - if (value.get<int>() != 10) { + value.set<int32_t>(10); + if (value.get<int32_t>() != 10) { cerr << "Failed to get Integer" << endl; return TestFail; } |