From 21e501f81005f0ea21bdd8d3d4c8771f1352fc19 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 29 Apr 2019 20:41:46 +0300 Subject: test: Unify naming of configurations in tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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/configuration_default.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/camera/configuration_default.cpp') diff --git a/test/camera/configuration_default.cpp b/test/camera/configuration_default.cpp index dd510668..2a10ea50 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; -- cgit v1.2.1