Skip to content

Commit ccc0b83

Browse files
committed
Fix lint
1 parent a896d58 commit ccc0b83

File tree

7 files changed

+36
-22
lines changed

7 files changed

+36
-22
lines changed

src/viam/sdk/components/camera.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ class Camera : public Component {
179179
/// sources are returned.
180180
/// @param extra any additional arguments to the method.
181181
/// @return a vector of raw_images and associated response metadata.
182-
virtual image_collection get_images(std::vector<std::string> filter_source_names, const ProtoStruct& extra) = 0;
182+
virtual image_collection get_images(std::vector<std::string> filter_source_names,
183+
const ProtoStruct& extra) = 0;
183184

184185
/// @brief Get the next `point_cloud` from the camera.
185186
/// @param mime_type the desired mime_type of the point_cloud (does not guarantee output type).

src/viam/sdk/components/private/camera_client.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,16 @@ Camera::raw_image CameraClient::get_image(std::string mime_type, const ProtoStru
126126
.invoke([](auto& response) { return from_proto(response); });
127127
};
128128

129-
Camera::image_collection CameraClient::get_images(std::vector<std::string> filter_source_names, const ProtoStruct& extra) {
130-
return make_client_helper(this, *stub_, &StubType::GetImages).with(extra, [&](auto& request) {
131-
for (const auto& source_name : filter_source_names) {
132-
*request.add_filter_source_names() = source_name;
133-
}
134-
}).invoke([](auto& response) {
135-
return from_proto(response);
136-
});
129+
Camera::image_collection CameraClient::get_images(std::vector<std::string> filter_source_names,
130+
const ProtoStruct& extra) {
131+
return make_client_helper(this, *stub_, &StubType::GetImages)
132+
.with(extra,
133+
[&](auto& request) {
134+
for (const auto& source_name : filter_source_names) {
135+
*request.add_filter_source_names() = source_name;
136+
}
137+
})
138+
.invoke([](auto& response) { return from_proto(response); });
137139
};
138140

139141
Camera::point_cloud CameraClient::get_point_cloud(std::string mime_type, const ProtoStruct& extra) {

src/viam/sdk/components/private/camera_client.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ class CameraClient : public Camera {
2626
CameraClient(std::string name, std::shared_ptr<grpc::Channel> channel);
2727
ProtoStruct do_command(const ProtoStruct& command) override;
2828
raw_image get_image(std::string mime_type, const ProtoStruct& extra) override;
29-
image_collection get_images(std::vector<std::string> filter_source_names, const ProtoStruct& extra) override;
29+
image_collection get_images(std::vector<std::string> filter_source_names,
30+
const ProtoStruct& extra) override;
3031
point_cloud get_point_cloud(std::string mime_type, const ProtoStruct& extra) override;
3132
properties get_properties() override;
3233
std::vector<GeometryConfig> get_geometries(const ProtoStruct& extra) override;

src/viam/sdk/components/private/camera_server.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,9 @@ ::grpc::Status CameraServer::GetImages(
8484
::viam::component::camera::v1::GetImagesResponse* response) noexcept {
8585
return make_service_helper<Camera>(
8686
"CameraServer::GetImages", this, request)([&](auto& helper, auto& camera) {
87-
const Camera::image_collection image_coll =
88-
camera->get_images({request->filter_source_names().begin(), request->filter_source_names().end()}, helper.getExtra());
87+
const Camera::image_collection image_coll = camera->get_images(
88+
{request->filter_source_names().begin(), request->filter_source_names().end()},
89+
helper.getExtra());
8990
for (const auto& img : image_coll.images) {
9091
::viam::component::camera::v1::Image proto_image;
9192
const std::string img_string = bytes_to_string(img.bytes);

src/viam/sdk/tests/mocks/camera_mocks.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include <viam/sdk/tests/mocks/camera_mocks.hpp>
21
#include <algorithm>
2+
#include <viam/sdk/tests/mocks/camera_mocks.hpp>
33

44
#include <viam/sdk/common/proto_value.hpp>
55
#include <viam/sdk/components/camera.hpp>
@@ -17,7 +17,8 @@ ProtoStruct MockCamera::do_command(const ProtoStruct&) {
1717
Camera::raw_image MockCamera::get_image(std::string, const ProtoStruct&) {
1818
return image_;
1919
}
20-
Camera::image_collection MockCamera::get_images(std::vector<std::string> filter_source_names, const ProtoStruct& extra) {
20+
Camera::image_collection MockCamera::get_images(std::vector<std::string> filter_source_names,
21+
const ProtoStruct& extra) {
2122
last_filter_source_names_ = std::move(filter_source_names);
2223
last_extra_ = extra;
2324
if (last_filter_source_names_.empty()) {
@@ -26,7 +27,9 @@ Camera::image_collection MockCamera::get_images(std::vector<std::string> filter_
2627
Camera::image_collection filtered = images_;
2728
filtered.images.clear();
2829
for (const auto& img : images_.images) {
29-
if (std::find(last_filter_source_names_.begin(), last_filter_source_names_.end(), img.source_name) != last_filter_source_names_.end()) {
30+
if (std::find(last_filter_source_names_.begin(),
31+
last_filter_source_names_.end(),
32+
img.source_name) != last_filter_source_names_.end()) {
3033
filtered.images.push_back(img);
3134
}
3235
}

src/viam/sdk/tests/mocks/camera_mocks.hpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,20 @@ class MockCamera : public Camera {
1212
public:
1313
ProtoStruct do_command(const ProtoStruct& command) override;
1414
raw_image get_image(std::string mime_type, const sdk::ProtoStruct& extra) override;
15-
image_collection get_images(std::vector<std::string> filter_source_names, const sdk::ProtoStruct& extra) override;
15+
image_collection get_images(std::vector<std::string> filter_source_names,
16+
const sdk::ProtoStruct& extra) override;
1617
point_cloud get_point_cloud(std::string mime_type, const sdk::ProtoStruct& extra) override;
1718
std::vector<GeometryConfig> get_geometries(const sdk::ProtoStruct& extra) override;
1819
properties get_properties() override;
1920
static std::shared_ptr<MockCamera> get_mock_camera();
2021
MockCamera(std::string name) : Camera(std::move(name)) {}
2122

22-
const std::vector<std::string>& last_filter_source_names() const { return last_filter_source_names_; }
23-
const ProtoStruct& last_extra() const { return last_extra_; }
23+
const std::vector<std::string>& last_filter_source_names() const {
24+
return last_filter_source_names_;
25+
}
26+
const ProtoStruct& last_extra() const {
27+
return last_extra_;
28+
}
2429

2530
private:
2631
Camera::intrinsic_parameters intrinsic_parameters_;

src/viam/sdk/tests/test_camera.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,17 @@ BOOST_AUTO_TEST_CASE(test_get_images_filtering) {
7070
}
7171

7272
BOOST_AUTO_TEST_CASE(test_get_images_with_extra) {
73-
std::shared_ptr<MockCamera> mock = MockCamera::get_mock_camera();
74-
client_to_mock_pipeline<Camera>(mock, [&](Camera& client) {
73+
SECTION("get_images happy path") {
74+
auto mock = MockCamera::get_mock_camera();
75+
CameraClient client("camera", std::make_shared<ClientChannel>("camera", "a", mock));
7576
ProtoStruct extra;
7677
extra["foo"] = ProtoValue("bar");
7778
auto images = client.get_images({}, extra);
78-
(void)images; // unused variable in test body
79+
(void)images; // unused variable in test body
7980
const auto& last_extra = mock->last_extra();
8081
BOOST_CHECK(last_extra.at("foo").is_a<std::string>());
8182
BOOST_CHECK_EQUAL(last_extra.at("foo").get_unchecked<std::string>(), "bar");
82-
});
83+
}
8384
}
8485

8586
BOOST_AUTO_TEST_CASE(test_get_point_cloud) {

0 commit comments

Comments
 (0)