Message ID | 20191108205409.18845-3-laurent.pinchart@ideasonboard.com |
---|---|
State | Accepted |
Headers | show |
Series |
|
Related | show |
Hi Laurent, Thanks for your work. On 2019-11-08 22:53:47 +0200, Laurent Pinchart wrote: > Add a test to exercise the ControlInfoMap API. This currently tests > at(), count(), find() and end(). > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > test/controls/control_info.cpp | 77 ++++++++++++++++++++++++++++++++++ > test/controls/meson.build | 1 + > 2 files changed, 78 insertions(+) > create mode 100644 test/controls/control_info.cpp > > diff --git a/test/controls/control_info.cpp b/test/controls/control_info.cpp > new file mode 100644 > index 000000000000..c2678ea3e593 > --- /dev/null > +++ b/test/controls/control_info.cpp > @@ -0,0 +1,77 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > +/* > + * Copyright (C) 2019, Google Inc. > + * > + * control_info.cpp - ControlInfoMap tests > + */ > + > +#include <iostream> > + > +#include <libcamera/camera.h> > +#include <libcamera/camera_manager.h> > +#include <libcamera/control_ids.h> > +#include <libcamera/controls.h> > + > +#include "camera_controls.h" > + > +#include "camera_test.h" > +#include "test.h" > + > +using namespace std; > +using namespace libcamera; > + > +class ControlInfoMapTest : public CameraTest, public Test > +{ > +public: > + ControlInfoMapTest() > + : CameraTest("VIMC Sensor B") > + { > + } > + > +protected: Do you not need: int init() override { return status_; } To make sure the camera is found? > + int run() > + { > + const ControlInfoMap &info = camera_->controls(); > + > + /* Test looking up a valid control by ControlId. */ > + if (info.count(&controls::Brightness) != 1) { > + cout << "count() on valid control failed" << endl; > + return TestFail; > + } > + > + if (info.find(&controls::Brightness) == info.end()) { > + cout << "find() on valid control failed" << endl; > + return TestFail; > + } > + > + info.at(&controls::Brightness); > + > + /* Test looking up a valid control by numerical ID. */ > + if (info.count(controls::Brightness.id()) != 1) { > + cout << "count() on valid ID failed" << endl; > + return TestFail; > + } > + > + if (info.find(controls::Brightness.id()) == info.end()) { > + cout << "find() on valid ID failed" << endl; > + return TestFail; > + } > + > + info.at(controls::Brightness.id()); > + > + /* Test looking up an invalid control by numerical ID. */ > + if (info.count(12345) != 0) { > + cout << "count() on invalid ID failed" << endl; > + return TestFail; > + } > + > + if (info.find(12345) != info.end()) { > + cout << "find() on invalid ID failed" << endl; > + return TestFail; > + } > + > + return TestPass; > + } > +}; > + > +TEST_REGISTER(ControlInfoMapTest) > diff --git a/test/controls/meson.build b/test/controls/meson.build > index 9f0f005a2759..f0850df28c8a 100644 > --- a/test/controls/meson.build > +++ b/test/controls/meson.build > @@ -1,4 +1,5 @@ > control_tests = [ > + [ 'control_info', 'control_info.cpp' ], > [ 'control_list', 'control_list.cpp' ], > [ 'control_range', 'control_range.cpp' ], > [ 'control_value', 'control_value.cpp' ], > -- > Regards, > > Laurent Pinchart > > _______________________________________________ > libcamera-devel mailing list > libcamera-devel@lists.libcamera.org > https://lists.libcamera.org/listinfo/libcamera-devel
Hi Laurent, On Fri, Nov 08, 2019 at 10:53:47PM +0200, Laurent Pinchart wrote: > Add a test to exercise the ControlInfoMap API. This currently tests > at(), count(), find() and end(). > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > test/controls/control_info.cpp | 77 ++++++++++++++++++++++++++++++++++ > test/controls/meson.build | 1 + > 2 files changed, 78 insertions(+) > create mode 100644 test/controls/control_info.cpp > > diff --git a/test/controls/control_info.cpp b/test/controls/control_info.cpp > new file mode 100644 > index 000000000000..c2678ea3e593 > --- /dev/null > +++ b/test/controls/control_info.cpp > @@ -0,0 +1,77 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > +/* > + * Copyright (C) 2019, Google Inc. > + * > + * control_info.cpp - ControlInfoMap tests > + */ > + > +#include <iostream> > + > +#include <libcamera/camera.h> > +#include <libcamera/camera_manager.h> > +#include <libcamera/control_ids.h> > +#include <libcamera/controls.h> > + > +#include "camera_controls.h" > + > +#include "camera_test.h" > +#include "test.h" > + > +using namespace std; > +using namespace libcamera; > + > +class ControlInfoMapTest : public CameraTest, public Test > +{ > +public: > + ControlInfoMapTest() > + : CameraTest("VIMC Sensor B") > + { > + } > + > +protected: > + int run() > + { > + const ControlInfoMap &info = camera_->controls(); > + > + /* Test looking up a valid control by ControlId. */ > + if (info.count(&controls::Brightness) != 1) { > + cout << "count() on valid control failed" << endl; Should we stabilise on using cerr for messages preceding a TestFail, like it seems you did in the previous patch ? Minor aparts Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Thanks j > + return TestFail; > + } > + > + if (info.find(&controls::Brightness) == info.end()) { > + cout << "find() on valid control failed" << endl; > + return TestFail; > + } > + > + info.at(&controls::Brightness); > + > + /* Test looking up a valid control by numerical ID. */ > + if (info.count(controls::Brightness.id()) != 1) { > + cout << "count() on valid ID failed" << endl; > + return TestFail; > + } > + > + if (info.find(controls::Brightness.id()) == info.end()) { > + cout << "find() on valid ID failed" << endl; > + return TestFail; > + } > + > + info.at(controls::Brightness.id()); > + > + /* Test looking up an invalid control by numerical ID. */ > + if (info.count(12345) != 0) { > + cout << "count() on invalid ID failed" << endl; > + return TestFail; > + } > + > + if (info.find(12345) != info.end()) { > + cout << "find() on invalid ID failed" << endl; > + return TestFail; > + } > + > + return TestPass; > + } > +}; > + > +TEST_REGISTER(ControlInfoMapTest) > diff --git a/test/controls/meson.build b/test/controls/meson.build > index 9f0f005a2759..f0850df28c8a 100644 > --- a/test/controls/meson.build > +++ b/test/controls/meson.build > @@ -1,4 +1,5 @@ > control_tests = [ > + [ 'control_info', 'control_info.cpp' ], > [ 'control_list', 'control_list.cpp' ], > [ 'control_range', 'control_range.cpp' ], > [ 'control_value', 'control_value.cpp' ], > -- > Regards, > > Laurent Pinchart > > _______________________________________________ > libcamera-devel mailing list > libcamera-devel@lists.libcamera.org > https://lists.libcamera.org/listinfo/libcamera-devel
Hi Niklas, On Thu, Nov 14, 2019 at 09:11:46AM +0100, Niklas Söderlund wrote: > On 2019-11-08 22:53:47 +0200, Laurent Pinchart wrote: > > Add a test to exercise the ControlInfoMap API. This currently tests > > at(), count(), find() and end(). > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > --- > > test/controls/control_info.cpp | 77 ++++++++++++++++++++++++++++++++++ > > test/controls/meson.build | 1 + > > 2 files changed, 78 insertions(+) > > create mode 100644 test/controls/control_info.cpp > > > > diff --git a/test/controls/control_info.cpp b/test/controls/control_info.cpp > > new file mode 100644 > > index 000000000000..c2678ea3e593 > > --- /dev/null > > +++ b/test/controls/control_info.cpp > > @@ -0,0 +1,77 @@ > > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > > +/* > > + * Copyright (C) 2019, Google Inc. > > + * > > + * control_info.cpp - ControlInfoMap tests > > + */ > > + > > +#include <iostream> > > + > > +#include <libcamera/camera.h> > > +#include <libcamera/camera_manager.h> > > +#include <libcamera/control_ids.h> > > +#include <libcamera/controls.h> > > + > > +#include "camera_controls.h" > > + > > +#include "camera_test.h" > > +#include "test.h" > > + > > +using namespace std; > > +using namespace libcamera; > > + > > +class ControlInfoMapTest : public CameraTest, public Test > > +{ > > +public: > > + ControlInfoMapTest() > > + : CameraTest("VIMC Sensor B") > > + { > > + } > > + > > +protected: > > Do you not need: > > int init() override > { > return status_; > } > > To make sure the camera is found? We do, I'll add that. > > + int run() > > + { > > + const ControlInfoMap &info = camera_->controls(); > > + > > + /* Test looking up a valid control by ControlId. */ > > + if (info.count(&controls::Brightness) != 1) { > > + cout << "count() on valid control failed" << endl; > > + return TestFail; > > + } > > + > > + if (info.find(&controls::Brightness) == info.end()) { > > + cout << "find() on valid control failed" << endl; > > + return TestFail; > > + } > > + > > + info.at(&controls::Brightness); > > + > > + /* Test looking up a valid control by numerical ID. */ > > + if (info.count(controls::Brightness.id()) != 1) { > > + cout << "count() on valid ID failed" << endl; > > + return TestFail; > > + } > > + > > + if (info.find(controls::Brightness.id()) == info.end()) { > > + cout << "find() on valid ID failed" << endl; > > + return TestFail; > > + } > > + > > + info.at(controls::Brightness.id()); > > + > > + /* Test looking up an invalid control by numerical ID. */ > > + if (info.count(12345) != 0) { > > + cout << "count() on invalid ID failed" << endl; > > + return TestFail; > > + } > > + > > + if (info.find(12345) != info.end()) { > > + cout << "find() on invalid ID failed" << endl; > > + return TestFail; > > + } > > + > > + return TestPass; > > + } > > +}; > > + > > +TEST_REGISTER(ControlInfoMapTest) > > diff --git a/test/controls/meson.build b/test/controls/meson.build > > index 9f0f005a2759..f0850df28c8a 100644 > > --- a/test/controls/meson.build > > +++ b/test/controls/meson.build > > @@ -1,4 +1,5 @@ > > control_tests = [ > > + [ 'control_info', 'control_info.cpp' ], > > [ 'control_list', 'control_list.cpp' ], > > [ 'control_range', 'control_range.cpp' ], > > [ 'control_value', 'control_value.cpp' ], > > -- > > Regards, > > > > Laurent Pinchart > > > > _______________________________________________ > > libcamera-devel mailing list > > libcamera-devel@lists.libcamera.org > > https://lists.libcamera.org/listinfo/libcamera-devel > > -- > Regards, > Niklas Söderlund
Hi Jacopo, On Fri, Nov 15, 2019 at 04:54:10PM +0100, Jacopo Mondi wrote: > On Fri, Nov 08, 2019 at 10:53:47PM +0200, Laurent Pinchart wrote: > > Add a test to exercise the ControlInfoMap API. This currently tests > > at(), count(), find() and end(). > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > --- > > test/controls/control_info.cpp | 77 ++++++++++++++++++++++++++++++++++ > > test/controls/meson.build | 1 + > > 2 files changed, 78 insertions(+) > > create mode 100644 test/controls/control_info.cpp > > > > diff --git a/test/controls/control_info.cpp b/test/controls/control_info.cpp > > new file mode 100644 > > index 000000000000..c2678ea3e593 > > --- /dev/null > > +++ b/test/controls/control_info.cpp > > @@ -0,0 +1,77 @@ > > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > > +/* > > + * Copyright (C) 2019, Google Inc. > > + * > > + * control_info.cpp - ControlInfoMap tests > > + */ > > + > > +#include <iostream> > > + > > +#include <libcamera/camera.h> > > +#include <libcamera/camera_manager.h> > > +#include <libcamera/control_ids.h> > > +#include <libcamera/controls.h> > > + > > +#include "camera_controls.h" > > + > > +#include "camera_test.h" > > +#include "test.h" > > + > > +using namespace std; > > +using namespace libcamera; > > + > > +class ControlInfoMapTest : public CameraTest, public Test > > +{ > > +public: > > + ControlInfoMapTest() > > + : CameraTest("VIMC Sensor B") > > + { > > + } > > + > > +protected: > > + int run() > > + { > > + const ControlInfoMap &info = camera_->controls(); > > + > > + /* Test looking up a valid control by ControlId. */ > > + if (info.count(&controls::Brightness) != 1) { > > + cout << "count() on valid control failed" << endl; > > Should we stabilise on using cerr for messages preceding a TestFail, > like it seems you did in the previous patch ? I'll change it here, but I think we should really create a test status class that bundles a message and a status code. Another item to add to the test refactoring todo list. > Minor aparts > Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> > > > + return TestFail; > > + } > > + > > + if (info.find(&controls::Brightness) == info.end()) { > > + cout << "find() on valid control failed" << endl; > > + return TestFail; > > + } > > + > > + info.at(&controls::Brightness); > > + > > + /* Test looking up a valid control by numerical ID. */ > > + if (info.count(controls::Brightness.id()) != 1) { > > + cout << "count() on valid ID failed" << endl; > > + return TestFail; > > + } > > + > > + if (info.find(controls::Brightness.id()) == info.end()) { > > + cout << "find() on valid ID failed" << endl; > > + return TestFail; > > + } > > + > > + info.at(controls::Brightness.id()); > > + > > + /* Test looking up an invalid control by numerical ID. */ > > + if (info.count(12345) != 0) { > > + cout << "count() on invalid ID failed" << endl; > > + return TestFail; > > + } > > + > > + if (info.find(12345) != info.end()) { > > + cout << "find() on invalid ID failed" << endl; > > + return TestFail; > > + } > > + > > + return TestPass; > > + } > > +}; > > + > > +TEST_REGISTER(ControlInfoMapTest) > > diff --git a/test/controls/meson.build b/test/controls/meson.build > > index 9f0f005a2759..f0850df28c8a 100644 > > --- a/test/controls/meson.build > > +++ b/test/controls/meson.build > > @@ -1,4 +1,5 @@ > > control_tests = [ > > + [ 'control_info', 'control_info.cpp' ], > > [ 'control_list', 'control_list.cpp' ], > > [ 'control_range', 'control_range.cpp' ], > > [ 'control_value', 'control_value.cpp' ],
Hi Laurent, On 2019-11-18 02:38:51 +0200, Laurent Pinchart wrote: > Hi Niklas, > > On Thu, Nov 14, 2019 at 09:11:46AM +0100, Niklas Söderlund wrote: > > On 2019-11-08 22:53:47 +0200, Laurent Pinchart wrote: > > > Add a test to exercise the ControlInfoMap API. This currently tests > > > at(), count(), find() and end(). > > > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > --- > > > test/controls/control_info.cpp | 77 ++++++++++++++++++++++++++++++++++ > > > test/controls/meson.build | 1 + > > > 2 files changed, 78 insertions(+) > > > create mode 100644 test/controls/control_info.cpp > > > > > > diff --git a/test/controls/control_info.cpp b/test/controls/control_info.cpp > > > new file mode 100644 > > > index 000000000000..c2678ea3e593 > > > --- /dev/null > > > +++ b/test/controls/control_info.cpp > > > @@ -0,0 +1,77 @@ > > > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > > > +/* > > > + * Copyright (C) 2019, Google Inc. > > > + * > > > + * control_info.cpp - ControlInfoMap tests > > > + */ > > > + > > > +#include <iostream> > > > + > > > +#include <libcamera/camera.h> > > > +#include <libcamera/camera_manager.h> > > > +#include <libcamera/control_ids.h> > > > +#include <libcamera/controls.h> > > > + > > > +#include "camera_controls.h" > > > + > > > +#include "camera_test.h" > > > +#include "test.h" > > > + > > > +using namespace std; > > > +using namespace libcamera; > > > + > > > +class ControlInfoMapTest : public CameraTest, public Test > > > +{ > > > +public: > > > + ControlInfoMapTest() > > > + : CameraTest("VIMC Sensor B") > > > + { > > > + } > > > + > > > +protected: > > > > Do you not need: > > > > int init() override > > { > > return status_; > > } > > > > To make sure the camera is found? > > We do, I'll add that. With that fixed, Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> > > > > + int run() > > > + { > > > + const ControlInfoMap &info = camera_->controls(); > > > + > > > + /* Test looking up a valid control by ControlId. */ > > > + if (info.count(&controls::Brightness) != 1) { > > > + cout << "count() on valid control failed" << endl; > > > + return TestFail; > > > + } > > > + > > > + if (info.find(&controls::Brightness) == info.end()) { > > > + cout << "find() on valid control failed" << endl; > > > + return TestFail; > > > + } > > > + > > > + info.at(&controls::Brightness); > > > + > > > + /* Test looking up a valid control by numerical ID. */ > > > + if (info.count(controls::Brightness.id()) != 1) { > > > + cout << "count() on valid ID failed" << endl; > > > + return TestFail; > > > + } > > > + > > > + if (info.find(controls::Brightness.id()) == info.end()) { > > > + cout << "find() on valid ID failed" << endl; > > > + return TestFail; > > > + } > > > + > > > + info.at(controls::Brightness.id()); > > > + > > > + /* Test looking up an invalid control by numerical ID. */ > > > + if (info.count(12345) != 0) { > > > + cout << "count() on invalid ID failed" << endl; > > > + return TestFail; > > > + } > > > + > > > + if (info.find(12345) != info.end()) { > > > + cout << "find() on invalid ID failed" << endl; > > > + return TestFail; > > > + } > > > + > > > + return TestPass; > > > + } > > > +}; > > > + > > > +TEST_REGISTER(ControlInfoMapTest) > > > diff --git a/test/controls/meson.build b/test/controls/meson.build > > > index 9f0f005a2759..f0850df28c8a 100644 > > > --- a/test/controls/meson.build > > > +++ b/test/controls/meson.build > > > @@ -1,4 +1,5 @@ > > > control_tests = [ > > > + [ 'control_info', 'control_info.cpp' ], > > > [ 'control_list', 'control_list.cpp' ], > > > [ 'control_range', 'control_range.cpp' ], > > > [ 'control_value', 'control_value.cpp' ], > > > -- > > > Regards, > > > > > > Laurent Pinchart > > > > > > _______________________________________________ > > > libcamera-devel mailing list > > > libcamera-devel@lists.libcamera.org > > > https://lists.libcamera.org/listinfo/libcamera-devel > > > > -- > > Regards, > > Niklas Söderlund > > -- > Regards, > > Laurent Pinchart
diff --git a/test/controls/control_info.cpp b/test/controls/control_info.cpp new file mode 100644 index 000000000000..c2678ea3e593 --- /dev/null +++ b/test/controls/control_info.cpp @@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * control_info.cpp - ControlInfoMap tests + */ + +#include <iostream> + +#include <libcamera/camera.h> +#include <libcamera/camera_manager.h> +#include <libcamera/control_ids.h> +#include <libcamera/controls.h> + +#include "camera_controls.h" + +#include "camera_test.h" +#include "test.h" + +using namespace std; +using namespace libcamera; + +class ControlInfoMapTest : public CameraTest, public Test +{ +public: + ControlInfoMapTest() + : CameraTest("VIMC Sensor B") + { + } + +protected: + int run() + { + const ControlInfoMap &info = camera_->controls(); + + /* Test looking up a valid control by ControlId. */ + if (info.count(&controls::Brightness) != 1) { + cout << "count() on valid control failed" << endl; + return TestFail; + } + + if (info.find(&controls::Brightness) == info.end()) { + cout << "find() on valid control failed" << endl; + return TestFail; + } + + info.at(&controls::Brightness); + + /* Test looking up a valid control by numerical ID. */ + if (info.count(controls::Brightness.id()) != 1) { + cout << "count() on valid ID failed" << endl; + return TestFail; + } + + if (info.find(controls::Brightness.id()) == info.end()) { + cout << "find() on valid ID failed" << endl; + return TestFail; + } + + info.at(controls::Brightness.id()); + + /* Test looking up an invalid control by numerical ID. */ + if (info.count(12345) != 0) { + cout << "count() on invalid ID failed" << endl; + return TestFail; + } + + if (info.find(12345) != info.end()) { + cout << "find() on invalid ID failed" << endl; + return TestFail; + } + + return TestPass; + } +}; + +TEST_REGISTER(ControlInfoMapTest) diff --git a/test/controls/meson.build b/test/controls/meson.build index 9f0f005a2759..f0850df28c8a 100644 --- a/test/controls/meson.build +++ b/test/controls/meson.build @@ -1,4 +1,5 @@ control_tests = [ + [ 'control_info', 'control_info.cpp' ], [ 'control_list', 'control_list.cpp' ], [ 'control_range', 'control_range.cpp' ], [ 'control_value', 'control_value.cpp' ],
Add a test to exercise the ControlInfoMap API. This currently tests at(), count(), find() and end(). Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- test/controls/control_info.cpp | 77 ++++++++++++++++++++++++++++++++++ test/controls/meson.build | 1 + 2 files changed, 78 insertions(+) create mode 100644 test/controls/control_info.cpp