{"id":1144,"url":"https://patchwork.libcamera.org/api/1.1/patches/1144/?format=json","web_url":"https://patchwork.libcamera.org/patch/1144/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190430183746.28518-5-laurent.pinchart@ideasonboard.com>","date":"2019-04-30T18:37:45","name":"[libcamera-devel,4/5] test: Unify naming of configurations in tests","commit_ref":"21e501f81005f0ea21bdd8d3d4c8771f1352fc19","pull_url":null,"state":"accepted","archived":false,"hash":"d6d1b79c3acdec6c87f5cdbdf17f83597688dac7","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1144/mbox/","series":[{"id":285,"url":"https://patchwork.libcamera.org/api/1.1/series/285/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=285","date":"2019-04-30T18:37:41","name":"Miscellaneous cleanups and refactoring","version":1,"mbox":"https://patchwork.libcamera.org/series/285/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1144/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1144/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E0A2B600F9\n\tfor ;\n\tTue, 30 Apr 2019 20:38:02 +0200 (CEST)","from pendragon.station (net-37-182-44-227.cust.vodafonedsl.it\n\t[37.182.44.227])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8B6C356A\n\tfor ;\n\tTue, 30 Apr 2019 20:38:02 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1556649482;\n\tbh=qmGkiIq/agi/2K+0ttciN0ediLMBmcXbGsbj+He0/Ao=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=Hi5ttmt/L9ybWz21PA/q01XuGhEQhxSJlWTh+qN3yOGflclSzL5NNWfB4khc06+cJ\n\tEOxXhKXFV48TnXfZSp4RYHXnO4X9biBYa892EE8RzwYx3cxCGFvgBmhTV9RkbUrlOo\n\t7XgirmS6MtWo1MXBYTEDf7IDpiJf6FWjZZt4L84Y=","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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 4/5] test: Unify naming of configurations\n\tin tests","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 30 Apr 2019 18:38:03 -0000"},"content":"Name all instances of CameraConfiguration \"config\", and all instances of\nStreamConfiguration \"cfg\" accross all tests.\n\nSigned-off-by: Laurent Pinchart \n---\n test/camera/capture.cpp | 14 +++++++-------\n test/camera/configuration_default.cpp | 10 +++++-----\n test/camera/configuration_set.cpp | 20 ++++++++++----------\n 3 files changed, 22 insertions(+), 22 deletions(-)","diff":"diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\nindex 4e75a75c5b71..0101cc94e665 100644\n--- a/test/camera/capture.cpp\n+++ b/test/camera/capture.cpp\n@@ -42,12 +42,12 @@ protected:\n \n \tint run()\n \t{\n-\t\tCameraConfiguration conf =\n+\t\tCameraConfiguration config =\n \t\t\tcamera_->streamConfiguration({ Stream::VideoRecording() });\n-\t\tStream *stream = conf.front();\n-\t\tStreamConfiguration *sconf = &conf[stream];\n+\t\tStream *stream = config.front();\n+\t\tStreamConfiguration *cfg = &config[stream];\n \n-\t\tif (!conf.isValid()) {\n+\t\tif (!config.isValid()) {\n \t\t\tcout << \"Failed to read default configuration\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -57,7 +57,7 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (camera_->configureStreams(conf)) {\n+\t\tif (camera_->configureStreams(config)) {\n \t\t\tcout << \"Failed to set default configuration\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -110,10 +110,10 @@ protected:\n \t\twhile (timer.isRunning())\n \t\t\tdispatcher->processEvents();\n \n-\t\tif (completeRequestsCount_ <= sconf->bufferCount * 2) {\n+\t\tif (completeRequestsCount_ <= cfg->bufferCount * 2) {\n \t\t\tcout << \"Failed to capture enough frames (got \"\n \t\t\t << completeRequestsCount_ << \" expected at least \"\n-\t\t\t << sconf->bufferCount * 2 << \")\" << endl;\n+\t\t\t << cfg->bufferCount * 2 << \")\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n \ndiff --git a/test/camera/configuration_default.cpp b/test/camera/configuration_default.cpp\nindex dd5106689f09..2a10ea507a67 100644\n--- a/test/camera/configuration_default.cpp\n+++ b/test/camera/configuration_default.cpp\n@@ -18,11 +18,11 @@ class ConfigurationDefault : public CameraTest\n protected:\n \tint run()\n \t{\n-\t\tCameraConfiguration conf;\n+\t\tCameraConfiguration config;\n \n \t\t/* Test asking for configuration for a video stream. */\n-\t\tconf = camera_->streamConfiguration({ Stream::VideoRecording() });\n-\t\tif (!conf.isValid()) {\n+\t\tconfig = camera_->streamConfiguration({ Stream::VideoRecording() });\n+\t\tif (!config.isValid()) {\n \t\t\tcout << \"Default configuration invalid\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -31,8 +31,8 @@ protected:\n \t\t * Test that asking for configuration for an empty array of\n \t\t * stream usages returns an empty list of configurations.\n \t\t */\n-\t\tconf = camera_->streamConfiguration({});\n-\t\tif (conf.isValid()) {\n+\t\tconfig = camera_->streamConfiguration({});\n+\t\tif (config.isValid()) {\n \t\t\tcout << \"Failed to retrieve configuration for empty usage list\"\n \t\t\t << endl;\n \t\t\treturn TestFail;\ndiff --git a/test/camera/configuration_set.cpp b/test/camera/configuration_set.cpp\nindex 0c932bc1de18..ca41ed689511 100644\n--- a/test/camera/configuration_set.cpp\n+++ b/test/camera/configuration_set.cpp\n@@ -18,11 +18,11 @@ class ConfigurationSet : public CameraTest\n protected:\n \tint run()\n \t{\n-\t\tCameraConfiguration conf =\n+\t\tCameraConfiguration config =\n \t\t\tcamera_->streamConfiguration({ Stream::VideoRecording() });\n-\t\tStreamConfiguration *sconf = &conf[conf.front()];\n+\t\tStreamConfiguration *cfg = &config[config.front()];\n \n-\t\tif (!conf.isValid()) {\n+\t\tif (!config.isValid()) {\n \t\t\tcout << \"Failed to read default configuration\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -33,7 +33,7 @@ protected:\n \t\t}\n \n \t\t/* Test that setting the default configuration works. */\n-\t\tif (camera_->configureStreams(conf)) {\n+\t\tif (camera_->configureStreams(config)) {\n \t\t\tcout << \"Failed to set default configuration\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -48,7 +48,7 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n-\t\tif (!camera_->configureStreams(conf)) {\n+\t\tif (!camera_->configureStreams(config)) {\n \t\t\tcout << \"Setting configuration on a camera not acquired succeeded when it should have failed\"\n \t\t\t << endl;\n \t\t\treturn TestFail;\n@@ -64,9 +64,9 @@ protected:\n \t\t * the default configuration of the VIMC camera is known to\n \t\t * work.\n \t\t */\n-\t\tsconf->size.width *= 2;\n-\t\tsconf->size.height *= 2;\n-\t\tif (camera_->configureStreams(conf)) {\n+\t\tcfg->size.width *= 2;\n+\t\tcfg->size.height *= 2;\n+\t\tif (camera_->configureStreams(config)) {\n \t\t\tcout << \"Failed to set modified configuration\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n@@ -74,8 +74,8 @@ protected:\n \t\t/*\n \t\t * Test that setting an invalid configuration fails.\n \t\t */\n-\t\tsconf->size = { 0, 0 };\n-\t\tif (!camera_->configureStreams(conf)) {\n+\t\tcfg->size = { 0, 0 };\n+\t\tif (!camera_->configureStreams(config)) {\n \t\t\tcout << \"Invalid configuration incorrectly accepted\" << endl;\n \t\t\treturn TestFail;\n \t\t}\n","prefixes":["libcamera-devel","4/5"]}