NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

test: control_list: Use get() to test for control presence

Browse source 
Now that the ControlList::get() function returns an std::optional<>, it
is the preferred way to test if a control is present in a ControlList.
Use it in the test to prepare for removal of ControlList::contains().

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2022-07-20 00:17:38 +03:00
parent 38136f9e11
commit b0b6621489
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/controls/control_list.cpp
View file

@ -50,7 +50,7 @@ protected:
return TestFail; return TestFail;
} }
if (list.contains(controls::Brightness)) { if (list.get(controls::Brightness)) {
cout << "List should not contain Brightness control" << endl; cout << "List should not contain Brightness control" << endl;
return TestFail; return TestFail;
} }
@ -80,7 +80,7 @@ protected:
return TestFail; return TestFail;
} }
if (!list.contains(controls::Brightness)) { if (!list.get(controls::Brightness)) {
cout << "List should contain Brightness control" << endl; cout << "List should contain Brightness control" << endl;
return TestFail; return TestFail;
} }
@ -99,7 +99,7 @@ protected:
return TestFail; return TestFail;
} }
if (list.contains(controls::Contrast)) { if (list.get(controls::Contrast)) {
cout << "List should not contain Contract control" << endl; cout << "List should not contain Contract control" << endl;
return TestFail; return TestFail;
} }
@ -108,8 +108,8 @@ protected:
list.set(controls::Brightness, 0.0f); list.set(controls::Brightness, 0.0f);
list.set(controls::Contrast, 1.5f); list.set(controls::Contrast, 1.5f);
if (!list.contains(controls::Brightness) || if (!list.get(controls::Brightness) ||
!list.contains(controls::Contrast)) { !list.get(controls::Contrast)) {
cout << "List should contain Brightness and Contrast controls" cout << "List should contain Brightness and Contrast controls"
<< endl; << endl;
return TestFail; return TestFail;
@ -145,7 +145,7 @@ protected:
*/ */
list.set(controls::AwbEnable, true); list.set(controls::AwbEnable, true);
if (list.contains(controls::AwbEnable)) { if (list.get(controls::AwbEnable)) {
cout << "List shouldn't contain AwbEnable control" << endl; cout << "List shouldn't contain AwbEnable control" << endl;
return TestFail; return TestFail;
} }
@ -171,9 +171,9 @@ protected:
return TestFail; return TestFail;
} }
if (!mergeList.contains(controls::Brightness) || if (!mergeList.get(controls::Brightness) ||
!mergeList.contains(controls::Contrast) || !mergeList.get(controls::Contrast) ||
!mergeList.contains(controls::Saturation)) { !mergeList.get(controls::Saturation)) {
cout << "Merged list does not contain all controls" << endl; cout << "Merged list does not contain all controls" << endl;
return TestFail; return TestFail;
} }