Better name for anonymous transfers (automatic renaming)

This commit is contained in:
Pavel Kirienko
2015-04-08 02:40:28 +03:00
parent 042aa60773
commit df2a38c217
13 changed files with 46 additions and 46 deletions
@@ -54,11 +54,11 @@ TEST(DynamicNodeIDAllocationClient, Basic)
/*
* Initializing subscriber
* Rogue transfers must be enabled
* Anonymous transfers must be enabled
*/
SubscriberWithCollector<uavcan::protocol::DynamicNodeIDAllocation> dynid_sub(nodes.a);
ASSERT_LE(0, dynid_sub.start());
dynid_sub.subscriber.allowRogueTransfers();
dynid_sub.subscriber.allowAnonymousTransfers();
/*
* Monitoring requests at 1Hz
@@ -86,7 +86,7 @@ TEST(DynamicNodeIDAllocationClient, Basic)
/*
* Sending a bunch of responses
* Note that response transfers are NOT rogue
* Note that response transfers are NOT anonymous
*/
uavcan::Publisher<uavcan::protocol::DynamicNodeIDAllocation> dynid_pub(nodes.a);
ASSERT_LE(0, dynid_pub.init());
@@ -245,7 +245,7 @@ TEST(TransferListener, MaximumTransferLength)
}
TEST(TransferListener, RogueTransfers)
TEST(TransferListener, AnonymousTransfers)
{
const uavcan::DataTypeDescriptor type(uavcan::DataTypeKindMessage, 123, uavcan::DataTypeSignature(123456789), "A");
@@ -264,15 +264,15 @@ TEST(TransferListener, RogueTransfers)
emulator.send(transfers);
// Nothing will be received, because rogue transfers are disabled by default
// Nothing will be received, because anonymous transfers are disabled by default
ASSERT_TRUE(subscriber.isEmpty());
subscriber.allowRogueTransfers();
subscriber.allowAnonymousTransfers();
// Re-send everything again
emulator.send(transfers);
// Now the rogue transfers are enabled
// Now the anonymous transfers are enabled
ASSERT_TRUE(subscriber.matchAndPop(transfers[1])); // Only SFT broadcast will be accepted
ASSERT_TRUE(subscriber.matchAndPop(transfers[3]));
+1 -1
View File
@@ -241,7 +241,7 @@ TEST(TransferSender, PassiveMode)
uavcan::TransferTypeMessageBroadcast, uavcan::NodeID::Broadcast));
// Overriding the default
sender.allowRogueTransfers();
sender.allowAnonymousTransfers();
// OK, now we can broadcast in any mode
ASSERT_LE(0, sender.send(Payload, sizeof(Payload), tsMono(1000), uavcan::MonotonicTime(),
@@ -132,11 +132,11 @@ public:
const bool single_frame = dynamic_cast<uavcan::SingleFrameIncomingTransfer*>(&transfer) != NULL;
const bool rogue = single_frame &&
transfer.getSrcNodeID().isBroadcast() &&
(transfer.getTransferType() == uavcan::TransferTypeMessageBroadcast);
const bool anonymous = single_frame &&
transfer.getSrcNodeID().isBroadcast() &&
(transfer.getTransferType() == uavcan::TransferTypeMessageBroadcast);
ASSERT_EQ(rogue, transfer.isRogueTransfer());
ASSERT_EQ(anonymous, transfer.isAnonymousTransfer());
}
bool matchAndPop(const Transfer& reference)