From patchwork Tue Apr 30 18:37:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1144 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E0A2B600F9 for ; Tue, 30 Apr 2019 20:38:02 +0200 (CEST) Received: from pendragon.station (net-37-182-44-227.cust.vodafonedsl.it [37.182.44.227]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8B6C356A for ; Tue, 30 Apr 2019 20:38:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1556649482; bh=qmGkiIq/agi/2K+0ttciN0ediLMBmcXbGsbj+He0/Ao=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Hi5ttmt/L9ybWz21PA/q01XuGhEQhxSJlWTh+qN3yOGflclSzL5NNWfB4khc06+cJ EOxXhKXFV48TnXfZSp4RYHXnO4X9biBYa892EE8RzwYx3cxCGFvgBmhTV9RkbUrlOo 7XgirmS6MtWo1MXBYTEDf7IDpiJf6FWjZZt4L84Y= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 30 Apr 2019 21:37:45 +0300 Message-Id: <20190430183746.28518-5-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430183746.28518-1-laurent.pinchart@ideasonboard.com> References: <20190430183746.28518-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 4/5] test: Unify naming of configurations in tests 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: Tue, 30 Apr 2019 18:38:03 -0000 Name all instances of CameraConfiguration "config", and all instances of StreamConfiguration "cfg" accross all tests. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- test/camera/capture.cpp | 14 +++++++------- test/camera/configuration_default.cpp | 10 +++++----- test/camera/configuration_set.cpp | 20 ++++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp index 4e75a75c5b71..0101cc94e665 100644 --- a/test/camera/capture.cpp +++ b/test/camera/capture.cpp @@ -42,12 +42,12 @@ protected: int run() { - CameraConfiguration conf = + CameraConfiguration config = camera_->streamConfiguration({ Stream::VideoRecording() }); - Stream *stream = conf.front(); - StreamConfiguration *sconf = &conf[stream]; + Stream *stream = config.front(); + StreamConfiguration *cfg = &config[stream]; - if (!conf.isValid()) { + if (!config.isValid()) { cout << "Failed to read default configuration" << endl; return TestFail; } @@ -57,7 +57,7 @@ protected: return TestFail; } - if (camera_->configureStreams(conf)) { + if (camera_->configureStreams(config)) { cout << "Failed to set default configuration" << endl; return TestFail; } @@ -110,10 +110,10 @@ protected: while (timer.isRunning()) dispatcher->processEvents(); - if (completeRequestsCount_ <= sconf->bufferCount * 2) { + if (completeRequestsCount_ <= cfg->bufferCount * 2) { cout << "Failed to capture enough frames (got " << completeRequestsCount_ << " expected at least " - << sconf->bufferCount * 2 << ")" << endl; + << cfg->bufferCount * 2 << ")" << endl; return TestFail; } diff --git a/test/camera/configuration_default.cpp b/test/camera/configuration_default.cpp index dd5106689f09..2a10ea507a67 100644 --- a/test/camera/configuration_default.cpp +++ b/test/camera/configuration_default.cpp @@ -18,11 +18,11 @@ class ConfigurationDefault : public CameraTest protected: int run() { - CameraConfiguration conf; + CameraConfiguration config; /* Test asking for configuration for a video stream. */ - conf = camera_->streamConfiguration({ Stream::VideoRecording() }); - if (!conf.isValid()) { + config = camera_->streamConfiguration({ Stream::VideoRecording() }); + if (!config.isValid()) { cout << "Default configuration invalid" << endl; return TestFail; } @@ -31,8 +31,8 @@ protected: * Test that asking for configuration for an empty array of * stream usages returns an empty list of configurations. */ - conf = camera_->streamConfiguration({}); - if (conf.isValid()) { + config = camera_->streamConfiguration({}); + if (config.isValid()) { cout << "Failed to retrieve configuration for empty usage list" << endl; return TestFail; diff --git a/test/camera/configuration_set.cpp b/test/camera/configuration_set.cpp index 0c932bc1de18..ca41ed689511 100644 --- a/test/camera/configuration_set.cpp +++ b/test/camera/configuration_set.cpp @@ -18,11 +18,11 @@ class ConfigurationSet : public CameraTest protected: int run() { - CameraConfiguration conf = + CameraConfiguration config = camera_->streamConfiguration({ Stream::VideoRecording() }); - StreamConfiguration *sconf = &conf[conf.front()]; + StreamConfiguration *cfg = &config[config.front()]; - if (!conf.isValid()) { + if (!config.isValid()) { cout << "Failed to read default configuration" << endl; return TestFail; } @@ -33,7 +33,7 @@ protected: } /* Test that setting the default configuration works. */ - if (camera_->configureStreams(conf)) { + if (camera_->configureStreams(config)) { cout << "Failed to set default configuration" << endl; return TestFail; } @@ -48,7 +48,7 @@ protected: return TestFail; } - if (!camera_->configureStreams(conf)) { + if (!camera_->configureStreams(config)) { cout << "Setting configuration on a camera not acquired succeeded when it should have failed" << endl; return TestFail; @@ -64,9 +64,9 @@ protected: * the default configuration of the VIMC camera is known to * work. */ - sconf->size.width *= 2; - sconf->size.height *= 2; - if (camera_->configureStreams(conf)) { + cfg->size.width *= 2; + cfg->size.height *= 2; + if (camera_->configureStreams(config)) { cout << "Failed to set modified configuration" << endl; return TestFail; } @@ -74,8 +74,8 @@ protected: /* * Test that setting an invalid configuration fails. */ - sconf->size = { 0, 0 }; - if (!camera_->configureStreams(conf)) { + cfg->size = { 0, 0 }; + if (!camera_->configureStreams(config)) { cout << "Invalid configuration incorrectly accepted" << endl; return TestFail; }