From patchwork Mon Apr 29 19:17:24 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: 1134 Return-Path: Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3119660E5A for ; Mon, 29 Apr 2019 21:17:51 +0200 (CEST) X-Halon-ID: 7a902e5c-6ab3-11e9-8e2c-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from wyvern.station (unknown [37.182.44.227]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id 7a902e5c-6ab3-11e9-8e2c-005056917f90; Mon, 29 Apr 2019 21:17:50 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Mon, 29 Apr 2019 21:17:24 +0200 Message-Id: <20190429191729.29697-7-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190429191729.29697-1-niklas.soderlund@ragnatech.se> References: <20190429191729.29697-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 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: Mon, 29 Apr 2019 19:17:52 -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 --- test/media_device/media_device_basic.cpp | 41 +++++++++++++++++++ test/media_device/media_device_print_test.cpp | 11 ----- test/media_device/meson.build | 1 + 3 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 test/media_device/media_device_basic.cpp diff --git a/test/media_device/media_device_basic.cpp b/test/media_device/media_device_basic.cpp new file mode 100644 index 0000000000000000..ba95dd0578fce22d --- /dev/null +++ b/test/media_device/media_device_basic.cpp @@ -0,0 +1,41 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * media_device_basic.cpp - Test basic functions of MediaDevice + */ + +#include "media_device_test.h" + +using namespace libcamera; + +class MediaDeviceBasic : public MediaDeviceTest +{ + int testAcquire() + { + if (!media_->acquire()) + return TestFail; + + if (media_->acquire()) + return TestFail; + + media_->release(); + + if (!media_->acquire()) + return TestFail; + + media_->release(); + + return TestPass; + } + + int run() + { + if (testAcquire() != TestPass) + return TestFail; + + return TestPass; + } +}; + +TEST_REGISTER(MediaDeviceBasic); 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 1005685409d99aa7..7a3266187abd806f 100644 --- a/test/media_device/meson.build +++ b/test/media_device/meson.build @@ -1,4 +1,5 @@ media_device_tests = [ + ['media_device_basic', 'media_device_basic.cpp'], ['media_device_print_test', 'media_device_print_test.cpp'], ['media_device_link_test', 'media_device_link_test.cpp'], ]