From patchwork Sat Jan 12 14:14:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 214 Return-Path: Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4CD6060C6A for ; Sat, 12 Jan 2019 15:14:36 +0100 (CET) X-Originating-IP: 2.224.242.101 Received: from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101]) (Authenticated sender: jacopo@jmondi.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id A2D8140003; Sat, 12 Jan 2019 14:14:35 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Sat, 12 Jan 2019 15:14:35 +0100 Message-Id: <20190112141436.1562-3-jacopo@jmondi.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190112141436.1562-1-jacopo@jmondi.org> References: <20190112141436.1562-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/3] test: media_device: Make MediaDeviceTest a MediaDevicePrintTest 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: Sat, 12 Jan 2019 14:14:36 -0000 As a new class for test link handling will be added as a separate test, it makes no sense to have a generic "MediaDeviceTest" class. Rename it in "MediaDevicePrintTest", and make it run only printing test. Reviewed-by: Laurent Pinchart Signed-off-by: Jacopo Mondi --- ...e_test.cpp => media_device_print_test.cpp} | 31 +++++++++---------- test/media_device/meson.build | 2 +- 2 files changed, 15 insertions(+), 18 deletions(-) rename test/media_device/{media_device_test.cpp => media_device_print_test.cpp} (79%) diff --git a/test/media_device/media_device_test.cpp b/test/media_device/media_device_print_test.cpp similarity index 79% rename from test/media_device/media_device_test.cpp rename to test/media_device/media_device_print_test.cpp index c482b2e..13af722 100644 --- a/test/media_device/media_device_test.cpp +++ b/test/media_device/media_device_print_test.cpp @@ -1,10 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * Copyright (C) 2018, Google Inc. + * Copyright (C) 2018-2019, Google Inc. * - * media_device_test.cpp - Tests for the media device class. - * - * Test library for the media device class. + * media_device_print_test.cpp - Print out media devices */ #include @@ -20,16 +18,16 @@ using namespace libcamera; using namespace std; /* - * MediaDeviceTest object: runs a sequence of tests on all media - * devices found in the system. + * MediaDevicePrintTest takes all media devices found in the system and print + * them out to verify correctness. * * If no accessible media device is found, the test is skipped. */ -class MediaDeviceTest : public Test +class MediaDevicePrintTest : public Test { public: - MediaDeviceTest() { } - ~MediaDeviceTest() { } + MediaDevicePrintTest() { } + ~MediaDevicePrintTest() { } protected: int init() { return 0; } @@ -44,7 +42,7 @@ private: void printNode(const MediaPad *pad, ostream &os); }; -void MediaDeviceTest::printNode(const MediaPad *pad, ostream &os) +void MediaDevicePrintTest::printNode(const MediaPad *pad, ostream &os) { const MediaEntity *entity = pad->entity(); @@ -52,7 +50,7 @@ void MediaDeviceTest::printNode(const MediaPad *pad, ostream &os) << pad->index() << "]"; } -void MediaDeviceTest::printLinkFlags(const MediaLink *link, ostream &os) +void MediaDevicePrintTest::printLinkFlags(const MediaLink *link, ostream &os) { unsigned int flags = link->flags(); @@ -68,7 +66,7 @@ void MediaDeviceTest::printLinkFlags(const MediaLink *link, ostream &os) * For each entity in the media graph, printout links directed to its sinks * and source pads. */ -void MediaDeviceTest::printMediaGraph(const MediaDevice &media, ostream &os) +void MediaDevicePrintTest::printMediaGraph(const MediaDevice &media, ostream &os) { os << "\n" << media.driver() << " - " << media.devnode() << "\n\n"; @@ -110,7 +108,7 @@ void MediaDeviceTest::printMediaGraph(const MediaDevice &media, ostream &os) } /* Test a single media device. */ -int MediaDeviceTest::testMediaDevice(const string devnode) +int MediaDevicePrintTest::testMediaDevice(const string devnode) { MediaDevice dev(devnode); int ret; @@ -134,9 +132,8 @@ int MediaDeviceTest::testMediaDevice(const string devnode) if (ret) return ret; - /* Run tests in sequence. */ + /* Print out the media graph. */ printMediaGraph(dev, cerr); - /* TODO: add more tests here. */ dev.close(); @@ -145,7 +142,7 @@ int MediaDeviceTest::testMediaDevice(const string devnode) /* Run tests on all media devices. */ #define MAX_MEDIA_DEV 256 -int MediaDeviceTest::run() +int MediaDevicePrintTest::run() { const string devnode("/dev/media"); unsigned int i; @@ -171,4 +168,4 @@ int MediaDeviceTest::run() return ret; } -TEST_REGISTER(MediaDeviceTest); +TEST_REGISTER(MediaDevicePrintTest); diff --git a/test/media_device/meson.build b/test/media_device/meson.build index 40f9ffa..e4bedb7 100644 --- a/test/media_device/meson.build +++ b/test/media_device/meson.build @@ -1,5 +1,5 @@ media_device_tests = [ - ['media_device_test', 'media_device_test.cpp'], + ['media_device_print_test', 'media_device_print_test.cpp'], ] foreach t : media_device_tests