caught more copy pastes

Author: randhid

src/viam/sdk/services/private/discovery_server.hpp

@@ -1,14 +1,14 @@
 /// @file services/private/discovery_server.hpp
-/// 
+///
 /// @brief Implements a gRPC server for the `Discovery` service
 #pragma once
 
 #include <viam/api/service/discovery/v1/discovery.grpc.pb.h>
 #include <viam/api/service/discovery/v1/discovery.pb.h>
 
-#include <viam/sdk/services/discovery.hpp>
 #include <viam/sdk/resource/resource_manager.hpp>
 #include <viam/sdk/resource/resource_server_base.hpp>
+#include <viam/sdk/services/discovery.hpp>
 
 namespace viam {
 namespace sdk {
@@ -18,7 +18,8 @@ namespace impl {
 /// @brief gRPC server implementation of a `Discovery` service.
 /// @ingroup Discovery
 
-class ArmServer : public ResourceServer, public viam::service::discovery::v1::DiscoveryService::Service {
+class DiscoveryServer : public ResourceServer, 
+                        public viam::service::discovery::v1::DiscoveryService::Service {
     public:
     using interface_type = Discovery;
     using service_type = service::discovery::v1::DiscoveryService;
@@ -34,7 +35,6 @@ class ArmServer : public ResourceServer, public viam::service::discovery::v1::Di
         ::grpc::ServerContext* context,
         const ::viam::service::discovery::v1::DoCommandRequest* request,
         ::viam::service::discovery::v1::DoCommandResponse* response) noexcept override;
-
 };
 
 }  // namespace impl

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

@@ -19,7 +19,7 @@ class MockDiscovery : public sdk::Discovery {
     sdk::ProtoStruct peek_command;
 };
 
-} // namespace discovery
-} // namespace sdktests
-} // namespace viam 
+}  // namespace discovery
+}  // namespace sdktests
+}  // namespace viam 
 

src/viam/sdk/tests/test_discovery.cpp

@@ -29,12 +29,12 @@ BOOST_AUTO_TEST_CASE(mock_get_api) {
 BOOST_AUTO_TEST_CASE(test_discover_resources) {
     std::shared_ptr<MockDiscovery> mock = MockDiscovery::get_mock_discovery();
     client_to_mock_pipeline<Discovery>(mock, [](Discovery& client) {
-        const auto & resources = client.discover_resources();
+        const auto& resources = client.discover_resources();
         BOOST_CHECK_EQUAL(resource, fake_discovered_resources());
     });
 }
 
-BOOST_AUTO_TEST_CASE(test_do_command)  {
+BOOST_AUTO_TEST_CASE(test_do_command) {
     std::shared_ptr<MockDiscovery> mock = MockDiscovery::get_mock_discovery();
     client_to_mock_pipeline<Discovery>(mock, [](Discovery& client) {
         ProtoStruct expected = fake_map();
@@ -46,5 +46,5 @@ BOOST_AUTO_TEST_CASE(test_do_command)  {
     });
 }
 
-} // namespace sdktests
-} // namespace viam
+}  // namespace sdktests
+}  // namespace viam

src/viam/sdk/tests/test_utils.cpp

@@ -28,21 +28,31 @@ std::vector<GeometryConfig> fake_geometries() {
 
 std::vector<ResourceConfig> fake_discovered_resources() {
     return {
-        ResourceConfig("camera", "mycam", "rdk", {
-            {"width", 640},
-            {"height", 480},
-            {"format", "mjpeg"}
-        }, "rdk:component:camera", "rdk:builtin:webcam"),
-        ResourceConfig("motor", "arm_motor", "rand", {
-            {"pins", {{"pwm", 18}, {"dir", 23}}},
-            {"max_rpm", 100},
-            {"encoder_steps", 200},
-        }, "rdk:component:motor", "rand:cool:motor" ),
-        ResourceConfig("sensor", "temp_sensor", "viam", {
-            {"type", "temperature"},
-            {"unit", "celsius"},
-            {"poll_rate", 1000}
-        }, "rdk:component:sensor", "viam:temp:sensor1"),
+        ResourceConfig(
+            "camera", 
+            "mycam", 
+            "rdk",
+            {{"width", 640}, {"height", 480}, {"format", "mjpeg"}}, 
+            "rdk:component:camera", 
+            "rdk:builtin:webcam"),
+        ResourceConfig(
+            "motor",
+            "arm_motor",
+            "rand",
+            {
+                {"pins", {{"pwm", 18}, {"dir", 23}}},
+                {"max_rpm", 100},
+                {"encoder_steps", 200},
+            }, 
+            "rdk:component:motor",
+            "rand:cool:motor"),
+        ResourceConfig(
+            "sensor",
+            "temp_sensor",
+            "viam",
+            {{"type", "temperature"}, {"unit", "celsius"}, {"poll_rate", 1000}},
+            "rdk:component:sensor",
+            "viam:temp:sensor1"),
     };
 }