diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/controls/control_info.cpp (renamed from test/controls/control_range.cpp) | 10 | ||||
| -rw-r--r-- | test/controls/meson.build | 2 | ||||
| -rw-r--r-- | test/serialization/serialization_test.cpp | 4 | ||||
| -rw-r--r-- | test/v4l2_videodevice/controls.cpp | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/test/controls/control_range.cpp b/test/controls/control_info.cpp index 06ec3506..1e05e131 100644 --- a/test/controls/control_range.cpp +++ b/test/controls/control_info.cpp @@ -2,7 +2,7 @@ /* * Copyright (C) 2019, Google Inc. * - * control_range.cpp - ControlRange tests + * control_info.cpp - ControlInfo tests */ #include <iostream> @@ -15,7 +15,7 @@ using namespace std; using namespace libcamera; -class ControlRangeTest : public Test +class ControlInfoTest : public Test { protected: int run() @@ -24,7 +24,7 @@ protected: * Test information retrieval from a range with no minimum and * maximum. */ - ControlRange brightness; + ControlInfo brightness; if (brightness.min().get<int32_t>() != 0 || brightness.max().get<int32_t>() != 0) { @@ -36,7 +36,7 @@ protected: * Test information retrieval from a control with a minimum and * a maximum value. */ - ControlRange contrast(10, 200); + ControlInfo contrast(10, 200); if (contrast.min().get<int32_t>() != 10 || contrast.max().get<int32_t>() != 200) { @@ -48,4 +48,4 @@ protected: } }; -TEST_REGISTER(ControlRangeTest) +TEST_REGISTER(ControlInfoTest) diff --git a/test/controls/meson.build b/test/controls/meson.build index 16a7f33f..7fff2413 100644 --- a/test/controls/meson.build +++ b/test/controls/meson.build @@ -1,7 +1,7 @@ control_tests = [ + [ 'control_info', 'control_info.cpp' ], [ 'control_info_map', 'control_info_map.cpp' ], [ 'control_list', 'control_list.cpp' ], - [ 'control_range', 'control_range.cpp' ], [ 'control_value', 'control_value.cpp' ], ] diff --git a/test/serialization/serialization_test.cpp b/test/serialization/serialization_test.cpp index 68e0512a..11d0f0f3 100644 --- a/test/serialization/serialization_test.cpp +++ b/test/serialization/serialization_test.cpp @@ -22,7 +22,7 @@ using namespace libcamera; bool SerializationTest::equals(const ControlInfoMap &lhs, const ControlInfoMap &rhs) { - std::map<unsigned int, ControlRange> rlhs; + std::map<unsigned int, ControlInfo> rlhs; std::transform(lhs.begin(), lhs.end(), std::inserter(rlhs, rlhs.end()), [](const ControlInfoMap::value_type &v) -> decltype(rlhs)::value_type @@ -30,7 +30,7 @@ bool SerializationTest::equals(const ControlInfoMap &lhs, const ControlInfoMap & return { v.first->id(), v.second }; }); - std::map<unsigned int, ControlRange> rrhs; + std::map<unsigned int, ControlInfo> rrhs; std::transform(rhs.begin(), rhs.end(), std::inserter(rrhs, rrhs.end()), [](const ControlInfoMap::value_type &v) -> decltype(rrhs)::value_type diff --git a/test/v4l2_videodevice/controls.cpp b/test/v4l2_videodevice/controls.cpp index 1b71bf06..478de370 100644 --- a/test/v4l2_videodevice/controls.cpp +++ b/test/v4l2_videodevice/controls.cpp @@ -41,9 +41,9 @@ protected: return TestFail; } - const ControlRange &brightness = infoMap.find(V4L2_CID_BRIGHTNESS)->second; - const ControlRange &contrast = infoMap.find(V4L2_CID_CONTRAST)->second; - const ControlRange &saturation = infoMap.find(V4L2_CID_SATURATION)->second; + const ControlInfo &brightness = infoMap.find(V4L2_CID_BRIGHTNESS)->second; + const ControlInfo &contrast = infoMap.find(V4L2_CID_CONTRAST)->second; + const ControlInfo &saturation = infoMap.find(V4L2_CID_SATURATION)->second; /* Test getting controls. */ ControlList ctrls(infoMap); |