From patchwork Fri May 17 00:54:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 1211 Return-Path: Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D4ABB60103 for ; Fri, 17 May 2019 02:55:13 +0200 (CEST) X-Halon-ID: 6c598152-783e-11e9-8d05-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id 6c598152-783e-11e9-8d05-005056917f90; Fri, 17 May 2019 02:55:11 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Fri, 17 May 2019 02:54:42 +0200 Message-Id: <20190517005447.27171-7-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190517005447.27171-1-niklas.soderlund@ragnatech.se> References: <20190517005447.27171-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 06/11] test: media_device: Add test for acquire() and release() X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2019 00:55:14 -0000 The interfaces MediaDevice::{open,close}() are about to be made private, replace them with a test of MediaDevice::{acquire,release}() instead. The new test will implicitly tests the open() and close() methods as they are about to be move inside acquire() and release() which will remain public. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- test/media_device/media_device_acquire.cpp | 33 +++++++++++++++++++ test/media_device/media_device_print_test.cpp | 11 ------- test/media_device/meson.build | 1 + 3 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 test/media_device/media_device_acquire.cpp diff --git a/test/media_device/media_device_acquire.cpp b/test/media_device/media_device_acquire.cpp new file mode 100644 index 0000000000000000..d1e3d74439e1c513 --- /dev/null +++ b/test/media_device/media_device_acquire.cpp @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * media_device_acquire.cpp- Test acquire/release of a MediaDevice + */ + +#include "media_device_test.h" + +using namespace libcamera; + +class MediaDeviceAcquire : public MediaDeviceTest +{ + int run() + { + if (!media_->acquire()) + return TestFail; + + if (media_->acquire()) + return TestFail; + + media_->release(); + + if (!media_->acquire()) + return TestFail; + + media_->release(); + + return TestPass; + } +}; + +TEST_REGISTER(MediaDeviceAcquire); diff --git a/test/media_device/media_device_print_test.cpp b/test/media_device/media_device_print_test.cpp index ceffd538e13fca73..30d929b8c76387a7 100644 --- a/test/media_device/media_device_print_test.cpp +++ b/test/media_device/media_device_print_test.cpp @@ -113,17 +113,6 @@ int MediaDevicePrintTest::testMediaDevice(const string deviceNode) MediaDevice dev(deviceNode); int ret; - /* Fuzzy open/close sequence. */ - ret = dev.open(); - if (ret) - return ret; - - ret = dev.open(); - if (!ret) - return ret; - - dev.close(); - ret = dev.populate(); if (ret) return ret; diff --git a/test/media_device/meson.build b/test/media_device/meson.build index 364b4ecf662077ac..05bf7c9b8de335d2 100644 --- a/test/media_device/meson.build +++ b/test/media_device/meson.build @@ -3,6 +3,7 @@ libmediadevicetest_sources = files([ ]) media_device_tests = [ + ['media_device_acquire', 'media_device_acquire.cpp'], ['media_device_print_test', 'media_device_print_test.cpp'], ['media_device_link_test', 'media_device_link_test.cpp'], ]