compAIR/libcreate
compAIR/libcreate
4
0
Fork 1
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Replace boost features with C++11 equivalents (#58)

Browse source 
* Replace boost features with C++11 equivalents

Signed-off-by: Jacob Perron <jacob@openrobotics.org>

* Include <cmath> in util.h

Needed for std::abs

Signed-off-by: Jacob Perron <jacob@openrobotics.org>
This commit is contained in:
Jacob Perron 2020-11-01 18:05:17 -08:00 • committed by GitHub
parent 850b011a55
commit 2b9591f0f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 95 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/test_create.cpp
View file

@ -33,8 +33,6 @@ POSSIBILITY OF SUCH DAMAGE.
#include "gtest/gtest.h"
#include <boost/shared_ptr.hpp>
TEST(CreateTest, ConstructorSingleParam)
{
create::Create create_default;

18
tests/test_data.cpp
View file

@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "gtest/gtest.h"
#include <boost/shared_ptr.hpp>
#include <memory>
TEST(DataTest, Constructor)
{
@ -76,31 +76,31 @@ TEST(DataTest, GetPacket)
{
// Get a packet exclusive to V_1
create::Data data_v_1(create::V_1);
boost::shared_ptr<create::Packet> v_1_packet_ptr = data_v_1.getPacket(create::ID_OVERCURRENTS);
EXPECT_NE(v_1_packet_ptr, boost::shared_ptr<create::Packet>())
std::shared_ptr<create::Packet> v_1_packet_ptr = data_v_1.getPacket(create::ID_OVERCURRENTS);
EXPECT_NE(v_1_packet_ptr, std::shared_ptr<create::Packet>())
<< "ID_OVERCURRENTS packet not found for protocol V_1";
EXPECT_EQ(static_cast<int>(v_1_packet_ptr->nbytes), 1);
EXPECT_EQ(v_1_packet_ptr->info, std::string("overcurrents"));
// Get a packet for V_2
create::Data data_v_2(create::V_2);
boost::shared_ptr<create::Packet> v_2_packet_ptr = data_v_2.getPacket(create::ID_DISTANCE);
EXPECT_NE(v_2_packet_ptr, boost::shared_ptr<create::Packet>())
std::shared_ptr<create::Packet> v_2_packet_ptr = data_v_2.getPacket(create::ID_DISTANCE);
EXPECT_NE(v_2_packet_ptr, std::shared_ptr<create::Packet>())
<< "ID_DISTANCE packet not found for protocol V_2";
EXPECT_EQ(static_cast<int>(v_2_packet_ptr->nbytes), 2);
EXPECT_EQ(v_2_packet_ptr->info, std::string("distance"));
// Get a packet exclusive to V_3
create::Data data_v_3(create::V_3);
boost::shared_ptr<create::Packet> v_3_packet_ptr = data_v_3.getPacket(create::ID_LIGHT_FRONT_RIGHT);
EXPECT_NE(v_3_packet_ptr, boost::shared_ptr<create::Packet>())
std::shared_ptr<create::Packet> v_3_packet_ptr = data_v_3.getPacket(create::ID_LIGHT_FRONT_RIGHT);
EXPECT_NE(v_3_packet_ptr, std::shared_ptr<create::Packet>())
<< "ID_LIGHT_FRONT_RIGHT packet not found for protocol V_3";
EXPECT_EQ(static_cast<int>(v_3_packet_ptr->nbytes), 2);
EXPECT_EQ(v_3_packet_ptr->info, std::string("light_bumper_front_right"));
// Get a non-existent packet
boost::shared_ptr<create::Packet> not_a_packet_ptr = data_v_3.getPacket(60);
EXPECT_EQ(not_a_packet_ptr, boost::shared_ptr<create::Packet>());
std::shared_ptr<create::Packet> not_a_packet_ptr = data_v_3.getPacket(60);
EXPECT_EQ(not_a_packet_ptr, std::shared_ptr<create::Packet>());
}
TEST(DataTest, GetPacketIDs)

14
tests/test_serial_query.cpp
View file

@ -33,17 +33,17 @@ POSSIBILITY OF SUCH DAMAGE.
#include "gtest/gtest.h"
#include <boost/shared_ptr.hpp>
#include <memory>
TEST(SerialQueryTest, Constructor)
{
boost::shared_ptr<create::Data> data_ptr = boost::make_shared<create::Data>();
std::shared_ptr<create::Data> data_ptr = std::make_shared<create::Data>();
create::SerialQuery serial_query(data_ptr);
}
TEST(SerialQueryTest, Connected)
{
boost::shared_ptr<create::Data> data_ptr = boost::make_shared<create::Data>();
std::shared_ptr<create::Data> data_ptr = std::make_shared<create::Data>();
create::SerialQuery serial_query(data_ptr);
// Did not call connect and nothing to connect to, so expect false
@ -52,7 +52,7 @@ TEST(SerialQueryTest, Connected)
TEST(SerialQueryTest, Disconnect)
{
boost::shared_ptr<create::Data> data_ptr = boost::make_shared<create::Data>();
std::shared_ptr<create::Data> data_ptr = std::make_shared<create::Data>();
create::SerialQuery serial_query(data_ptr);
// Not connected, but should not fail
@ -61,7 +61,7 @@ TEST(SerialQueryTest, Disconnect)
TEST(SerialQueryTest, NumPackets)
{
boost::shared_ptr<create::Data> data_ptr = boost::make_shared<create::Data>();
std::shared_ptr<create::Data> data_ptr = std::make_shared<create::Data>();
create::SerialQuery serial_query(data_ptr);
// Not connected, so zero packets should have been received
@ -71,7 +71,7 @@ TEST(SerialQueryTest, NumPackets)
TEST(SerialQueryTest, Send)
{
boost::shared_ptr<create::Data> data_ptr = boost::make_shared<create::Data>();
std::shared_ptr<create::Data> data_ptr = std::make_shared<create::Data>();
create::SerialQuery serial_query(data_ptr);
// Some bytes to send (to set date)
@ -82,7 +82,7 @@ TEST(SerialQueryTest, Send)
TEST(SerialQueryTest, SendOpcode)
{
boost::shared_ptr<create::Data> data_ptr = boost::make_shared<create::Data>();
std::shared_ptr<create::Data> data_ptr = std::make_shared<create::Data>();
create::SerialQuery serial_query(data_ptr);
// Not connected, so failure expected

14
tests/test_serial_stream.cpp
View file

@ -33,17 +33,17 @@ POSSIBILITY OF SUCH DAMAGE.
#include "gtest/gtest.h"
#include <boost/shared_ptr.hpp>
#include <memory>
TEST(SerialStreamTest, Constructor)
{
boost::shared_ptr<create::Data> data_ptr = boost::make_shared<create::Data>();
std::shared_ptr<create::Data> data_ptr = std::make_shared<create::Data>();
create::SerialStream serial_stream(data_ptr);
}
TEST(SerialStreamTest, Connected)
{
boost::shared_ptr<create::Data> data_ptr = boost::make_shared<create::Data>();
std::shared_ptr<create::Data> data_ptr = std::make_shared<create::Data>();
create::SerialStream serial_stream(data_ptr);
// Did not call connect and nothing to connect to, so expect false
@ -52,7 +52,7 @@ TEST(SerialStreamTest, Connected)
TEST(SerialStreamTest, Disconnect)
{
boost::shared_ptr<create::Data> data_ptr = boost::make_shared<create::Data>();
std::shared_ptr<create::Data> data_ptr = std::make_shared<create::Data>();
create::SerialStream serial_stream(data_ptr);
// Not connected, but should not fail
@ -61,7 +61,7 @@ TEST(SerialStreamTest, Disconnect)
TEST(SerialStreamTest, NumPackets)
{
boost::shared_ptr<create::Data> data_ptr = boost::make_shared<create::Data>();
std::shared_ptr<create::Data> data_ptr = std::make_shared<create::Data>();
create::SerialStream serial_stream(data_ptr);
// Not connected, so zero packets should have been received
@ -71,7 +71,7 @@ TEST(SerialStreamTest, NumPackets)
TEST(SerialStreamTest, Send)
{
boost::shared_ptr<create::Data> data_ptr = boost::make_shared<create::Data>();
std::shared_ptr<create::Data> data_ptr = std::make_shared<create::Data>();
create::SerialStream serial_stream(data_ptr);
// Some bytes to send (to set date)
@ -82,7 +82,7 @@ TEST(SerialStreamTest, Send)
TEST(SerialStreamTest, SendOpcode)
{
boost::shared_ptr<create::Data> data_ptr = boost::make_shared<create::Data>();
std::shared_ptr<create::Data> data_ptr = std::make_shared<create::Data>();
create::SerialStream serial_stream(data_ptr);
// Not connected, so failure expected