Skip to content

Commit

Permalink
Fix test labels
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterBowman committed Feb 15, 2021
1 parent ef0e290 commit 98f9e37
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
24 changes: 12 additions & 12 deletions tests/testCanOpenNodeLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ class FakeCanSenderDelegate : public CanSenderDelegate
* @ingroup testCanOpenNodeLib
* @brief Manages a FakeCanSenderDelegate and registers asynchronous operations.
*/
class CanBusSharerTest : public testing::Test,
protected FutureObserver
class CanOpenNodeTest : public testing::Test,
protected FutureObserver
{
public:
virtual void SetUp()
Expand All @@ -133,7 +133,7 @@ class CanBusSharerTest : public testing::Test,
FakeCanSenderDelegate * senderDelegate;
};

TEST_F(CanBusSharerTest, SdoClientExpeditedUpload)
TEST_F(CanOpenNodeTest, SdoClientExpeditedUpload)
{
const std::uint8_t id = 0x05;
const std::uint16_t cobRx = 0x600;
Expand Down Expand Up @@ -213,7 +213,7 @@ TEST_F(CanBusSharerTest, SdoClientExpeditedUpload)
ASSERT_FALSE(sdo.upload("Upload overrun test", &actualOvr, index, subindex));
}

TEST_F(CanBusSharerTest, SdoClientExpeditedDownload)
TEST_F(CanOpenNodeTest, SdoClientExpeditedDownload)
{
const std::uint8_t id = 0x05;
const std::uint16_t cobRx = 0x600;
Expand Down Expand Up @@ -272,7 +272,7 @@ TEST_F(CanBusSharerTest, SdoClientExpeditedDownload)
ASSERT_FALSE(sdo.download<std::int8_t>("Download test 4", 0x44, index, subindex));
}

TEST_F(CanBusSharerTest, SdoClientSegmented)
TEST_F(CanOpenNodeTest, SdoClientSegmented)
{
SdoClient sdo(0x05, 0x600, 0x580, TIMEOUT, getSender());

Expand Down Expand Up @@ -367,7 +367,7 @@ TEST_F(CanBusSharerTest, SdoClientSegmented)
ASSERT_EQ(getSender()->getMessage(3).data, toInt64(0x0D, s.substr(14, 1)));
}

TEST_F(CanBusSharerTest, SdoClientPing)
TEST_F(CanOpenNodeTest, SdoClientPing)
{
const std::uint8_t id = 0x05;
const std::uint16_t cobRx = 0x600;
Expand All @@ -388,7 +388,7 @@ TEST_F(CanBusSharerTest, SdoClientPing)
ASSERT_TRUE(sdo.ping());
}

TEST_F(CanBusSharerTest, ReceivePdo)
TEST_F(CanOpenNodeTest, ReceivePdo)
{
SdoClient sdo(0x05, 0x600, 0x580, TIMEOUT, getSender());

Expand Down Expand Up @@ -487,7 +487,7 @@ TEST_F(CanBusSharerTest, ReceivePdo)
ASSERT_FALSE(rpdo1.configure(rpdo1Conf));
}

TEST_F(CanBusSharerTest, TransmitPdo)
TEST_F(CanOpenNodeTest, TransmitPdo)
{
SdoClient sdo(0x05, 0x600, 0x580, TIMEOUT, getSender());

Expand Down Expand Up @@ -610,7 +610,7 @@ TEST_F(CanBusSharerTest, TransmitPdo)
ASSERT_FALSE(tpdo1.accept(nullptr, 0));
}

TEST_F(CanBusSharerTest, NmtProtocol)
TEST_F(CanOpenNodeTest, NmtProtocol)
{
const std::uint8_t id = 0x05;
NmtProtocol nmt(id, getSender());
Expand Down Expand Up @@ -677,7 +677,7 @@ TEST_F(CanBusSharerTest, NmtProtocol)
ASSERT_EQ(getSender()->getLastMessage().data, static_cast<std::uint8_t>(NmtService::START_REMOTE_NODE) + (id << 8));
}

TEST_F(CanBusSharerTest, EmcyConsumer)
TEST_F(CanOpenNodeTest, EmcyConsumer)
{
EmcyConsumer emcy;

Expand Down Expand Up @@ -753,7 +753,7 @@ TEST_F(CanBusSharerTest, EmcyConsumer)
ASSERT_FALSE(emcy.accept(nullptr));
}

TEST_F(CanBusSharerTest, DriveStatusMachine)
TEST_F(CanOpenNodeTest, DriveStatusMachine)
{
const std::uint8_t id = 0x05;
SdoClient sdo(id, 0x600, 0x580, TIMEOUT, getSender());
Expand Down Expand Up @@ -1101,7 +1101,7 @@ TEST_F(CanBusSharerTest, DriveStatusMachine)
ASSERT_FALSE(status.requestState(DriveState::SWITCH_ON_DISABLED));
}

TEST_F(CanBusSharerTest, CanOpenNode)
TEST_F(CanOpenNodeTest, CanOpenNode)
{
std::uint8_t id = 0x05;
CanOpenNode can(id, TIMEOUT, TIMEOUT, getSender());
Expand Down
6 changes: 3 additions & 3 deletions tests/testStateObserverLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ namespace test
* @ingroup testStateObserverLib
* @brief See @ref FutureObserver.
*/
class CanBusSharerTest : public testing::Test,
protected FutureObserver
class StateObserverTest : public testing::Test,
protected FutureObserver
{
public:
virtual void SetUp()
Expand All @@ -39,7 +39,7 @@ class CanBusSharerTest : public testing::Test,
static constexpr double TIMEOUT = 0.125; // [s]
};

TEST_F(CanBusSharerTest, StateObserver)
TEST_F(StateObserverTest, StateObserver)
{
// test StateObserver

Expand Down
12 changes: 6 additions & 6 deletions tests/testYarpDeviceMapperLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ struct JointDriver : public yarp::dev::DeviceDriver,
* @ingroup testYarpDeviceMapperLib
* @brief Wrapper class for DummyPositionDirectRawImpl and JointDriver instances.
*/
class DeviceMapperTest : public testing::Test
class YarpDeviceMapperTest : public testing::Test
{
public:
DeviceMapperTest() : dummy(nullptr)
YarpDeviceMapperTest() : dummy(nullptr)
{ }

virtual void SetUp()
Expand Down Expand Up @@ -151,7 +151,7 @@ class DeviceMapperTest : public testing::Test
yarp::dev::PolyDriverList drivers;
};

TEST_F(DeviceMapperTest, SequentialTask)
TEST_F(YarpDeviceMapperTest, SequentialTask)
{
const int joint = 4;

Expand Down Expand Up @@ -208,7 +208,7 @@ TEST_F(DeviceMapperTest, SequentialTask)
ASSERT_NEAR(ref, joint, EPSILON);
}

TEST_F(DeviceMapperTest, ParallelTask)
TEST_F(YarpDeviceMapperTest, ParallelTask)
{
const int joint = 4;

Expand All @@ -233,15 +233,15 @@ TEST_F(DeviceMapperTest, ParallelTask)
ASSERT_NEAR(ref3, joint, EPSILON);
}

TEST_F(DeviceMapperTest, RawDevice)
TEST_F(YarpDeviceMapperTest, RawDevice)
{
RawDevice rd(getDriver<JointDriver<1>>());
auto * p = rd.getHandle<yarp::dev::IPositionDirectRaw>();
ASSERT_NE(p, nullptr);
ASSERT_EQ(rd.castToType<std::string>(), nullptr);
}

TEST_F(DeviceMapperTest, DeviceMapper)
TEST_F(YarpDeviceMapperTest, DeviceMapper)
{
DeviceMapper mapper;

Expand Down

0 comments on commit 98f9e37

Please sign in to comment.