[libcamera-devel] test: Remove list-cameras test

9033 diff mbox series

The list-cameras test case is the very first test case that has been
added to libcamera. It has served to start the development of the unit
tests infrastructure. Since then, libcamera has grown several tests that
cover the same API, and more. It's time for list-cameras to retire.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 test/list-cameras.cpp | 54 -------------------------------------------
 test/meson.build      |  1 -
 2 files changed, 55 deletions(-)
 delete mode 100644 test/list-cameras.cpp

Hi Laurent,

Thanks for the patch.

On 7/28/20 12:27 AM, Laurent Pinchart wrote:
> The list-cameras test case is the very first test case that has been
> added to libcamera. It has served to start the development of the unit
> tests infrastructure. Since then, libcamera has grown several tests that
> cover the same API, and more. It's time for list-cameras to retire.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
I agree with the changes, even with given limited experience with codebase
and test coverage of libcamera. Hence,

Reviewed-by: Umang Jain <email@uajain.com>

> ---
>   test/list-cameras.cpp | 54 -------------------------------------------
>   test/meson.build      |  1 -
>   2 files changed, 55 deletions(-)
>   delete mode 100644 test/list-cameras.cpp
>
> diff --git a/test/list-cameras.cpp b/test/list-cameras.cpp
> deleted file mode 100644
> index e6a407aca7f8..000000000000
> --- a/test/list-cameras.cpp
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> -/*
> - * Copyright (C) 2018, Google Inc.
> - *
> - * list.cpp - camera list tests
> - */
> -
> -#include <iostream>
> -
> -#include <libcamera/camera.h>
> -#include <libcamera/camera_manager.h>
> -
> -#include "test.h"
> -
> -using namespace std;
> -using namespace libcamera;
> -
> -class ListTest : public Test
> -{
> -protected:
> -	int init()
> -	{
> -		cm_ = new CameraManager();
> -		if (cm_->start()) {
> -			std::cout << "Failed to start camera" << std::endl;
> -			return TestFail;
> -		}
> -
> -		return 0;
> -	}
> -
> -	int run()
> -	{
> -		unsigned int count = 0;
> -
> -		for (const std::shared_ptr<Camera> &camera : cm_->cameras()) {
> -			cout << "- " << camera->name() << endl;
> -			count++;
> -		}
> -
> -		return count ? 0 : -ENODEV;
> -	}
> -
> -	void cleanup()
> -	{
> -		cm_->stop();
> -		delete cm_;
> -	}
> -
> -private:
> -	CameraManager *cm_;
> -};
> -
> -TEST_REGISTER(ListTest)
> diff --git a/test/meson.build b/test/meson.build
> index f41d6e740e6a..c0fb9bdfac17 100644
> --- a/test/meson.build
> +++ b/test/meson.build
> @@ -18,7 +18,6 @@ subdir('v4l2_videodevice')
>   
>   public_tests = [
>       ['geometry',                        'geometry.cpp'],
> -    ['list-cameras',                    'list-cameras.cpp'],
>       ['signal',                          'signal.cpp'],
>       ['span',                            'span.cpp'],
>   ]

Hi Laurent,

Thanks for your patch.

On 2020-07-27 21:57:31 +0300, Laurent Pinchart wrote:
> The list-cameras test case is the very first test case that has been
> added to libcamera. It has served to start the development of the unit
> tests infrastructure. Since then, libcamera has grown several tests that
> cover the same API, and more. It's time for list-cameras to retire.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  test/list-cameras.cpp | 54 -------------------------------------------
>  test/meson.build      |  1 -
>  2 files changed, 55 deletions(-)
>  delete mode 100644 test/list-cameras.cpp
> 
> diff --git a/test/list-cameras.cpp b/test/list-cameras.cpp
> deleted file mode 100644
> index e6a407aca7f8..000000000000
> --- a/test/list-cameras.cpp
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> -/*
> - * Copyright (C) 2018, Google Inc.
> - *
> - * list.cpp - camera list tests
> - */
> -
> -#include <iostream>
> -
> -#include <libcamera/camera.h>
> -#include <libcamera/camera_manager.h>
> -
> -#include "test.h"
> -
> -using namespace std;
> -using namespace libcamera;
> -
> -class ListTest : public Test
> -{
> -protected:
> -	int init()
> -	{
> -		cm_ = new CameraManager();
> -		if (cm_->start()) {
> -			std::cout << "Failed to start camera" << std::endl;
> -			return TestFail;
> -		}
> -
> -		return 0;
> -	}
> -
> -	int run()
> -	{
> -		unsigned int count = 0;
> -
> -		for (const std::shared_ptr<Camera> &camera : cm_->cameras()) {
> -			cout << "- " << camera->name() << endl;
> -			count++;
> -		}
> -
> -		return count ? 0 : -ENODEV;
> -	}
> -
> -	void cleanup()
> -	{
> -		cm_->stop();
> -		delete cm_;
> -	}
> -
> -private:
> -	CameraManager *cm_;
> -};
> -
> -TEST_REGISTER(ListTest)
> diff --git a/test/meson.build b/test/meson.build
> index f41d6e740e6a..c0fb9bdfac17 100644
> --- a/test/meson.build
> +++ b/test/meson.build
> @@ -18,7 +18,6 @@ subdir('v4l2_videodevice')
>  
>  public_tests = [
>      ['geometry',                        'geometry.cpp'],
> -    ['list-cameras',                    'list-cameras.cpp'],
>      ['signal',                          'signal.cpp'],
>      ['span',                            'span.cpp'],
>  ]
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel