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/capture.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'test/camera/capture.cpp') diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp index 4e75a75c..0101cc94 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; } -- cgit v1.2.1