Skip to content

Commit

Permalink
Refs #13326: linters
Browse files Browse the repository at this point in the history
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
  • Loading branch information
JLBuenoLopez committed Dec 22, 2021
1 parent c0cb284 commit a343f0e
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 48 deletions.
22 changes: 12 additions & 10 deletions test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <process.h>
#else
#define GET_PID getpid
#endif
#endif // if defined(_WIN32)

namespace eprosima {
namespace fastdds {
Expand All @@ -48,9 +48,9 @@ class Subscriber;
class DataReader;
class Publisher;
class DataWriter;
}
}
}
} // namespace dds
} // namespace fastdds
} // namespace eprosima


class ReqRepHelloWorldReplier
Expand All @@ -59,7 +59,7 @@ class ReqRepHelloWorldReplier

class ReplyListener : public eprosima::fastdds::dds::DataReaderListener
{
public:
public:

ReplyListener(
ReqRepHelloWorldReplier& replier)
Expand All @@ -84,17 +84,18 @@ class ReqRepHelloWorldReplier
}
}

private:
private:

ReplyListener& operator =(
const ReplyListener&) = delete;

ReqRepHelloWorldReplier& replier_;
} request_listener_;
}
request_listener_;

class RequestListener : public eprosima::fastdds::dds::DataWriterListener
{
public:
public:

RequestListener(
ReqRepHelloWorldReplier& replier)
Expand All @@ -116,14 +117,15 @@ class ReqRepHelloWorldReplier
}
}

private:
private:

RequestListener& operator =(
const RequestListener&) = delete;

ReqRepHelloWorldReplier& replier_;

} reply_listener_;
}
reply_listener_;

ReqRepHelloWorldReplier();
virtual ~ReqRepHelloWorldReplier();
Expand Down
22 changes: 12 additions & 10 deletions test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#define GET_PID _getpid
#else
#define GET_PID getpid
#endif
#endif // if defined(_WIN32)

namespace eprosima {
namespace fastdds {
Expand All @@ -51,17 +51,17 @@ class Subscriber;
class DataReader;
class Publisher;
class DataWriter;
}
}
}
} // namespace dds
} // namespace fastdds
} // namespace eprosima

class ReqRepHelloWorldRequester
{
public:

class ReplyListener : public eprosima::fastdds::dds::DataReaderListener
{
public:
public:

ReplyListener(
ReqRepHelloWorldRequester& requester)
Expand All @@ -86,17 +86,18 @@ class ReqRepHelloWorldRequester
}
}

private:
private:

ReplyListener& operator =(
const ReplyListener&) = delete;

ReqRepHelloWorldRequester& requester_;
} reply_listener_;
}
reply_listener_;

class RequestListener : public eprosima::fastdds::dds::DataWriterListener
{
public:
public:

RequestListener(
ReqRepHelloWorldRequester& requester)
Expand All @@ -118,14 +119,15 @@ class ReqRepHelloWorldRequester
}
}

private:
private:

RequestListener& operator =(
const RequestListener&) = delete;

ReqRepHelloWorldRequester& requester_;

} request_listener_;
}
request_listener_;

ReqRepHelloWorldRequester();
virtual ~ReqRepHelloWorldRequester();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <process.h>
#else
#define GET_PID getpid
#endif
#endif // if defined(_WIN32)



Expand All @@ -46,7 +46,7 @@ class ReqRepHelloWorldReplier

class ReplyListener : public eprosima::fastrtps::SubscriberListener
{
public:
public:

ReplyListener(
ReqRepHelloWorldReplier& replier)
Expand All @@ -70,17 +70,18 @@ class ReqRepHelloWorldReplier
}
}

private:
private:

ReplyListener& operator =(
const ReplyListener&) = delete;

ReqRepHelloWorldReplier& replier_;
} request_listener_;
}
request_listener_;

class RequestListener : public eprosima::fastrtps::PublisherListener
{
public:
public:

RequestListener(
ReqRepHelloWorldReplier& replier)
Expand All @@ -102,14 +103,15 @@ class ReqRepHelloWorldReplier
}
}

private:
private:

RequestListener& operator =(
const RequestListener&) = delete;

ReqRepHelloWorldReplier& replier_;

} reply_listener_;
}
reply_listener_;

ReqRepHelloWorldReplier();
virtual ~ReqRepHelloWorldReplier();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#define GET_PID _getpid
#else
#define GET_PID getpid
#endif
#endif // if defined(_WIN32)



Expand All @@ -49,7 +49,7 @@ class ReqRepHelloWorldRequester

class ReplyListener : public eprosima::fastrtps::SubscriberListener
{
public:
public:

ReplyListener(
ReqRepHelloWorldRequester& requester)
Expand All @@ -73,17 +73,18 @@ class ReqRepHelloWorldRequester
}
}

private:
private:

ReplyListener& operator =(
const ReplyListener&) = delete;

ReqRepHelloWorldRequester& requester_;
} reply_listener_;
}
reply_listener_;

class RequestListener : public eprosima::fastrtps::PublisherListener
{
public:
public:

RequestListener(
ReqRepHelloWorldRequester& requester)
Expand All @@ -105,14 +106,15 @@ class ReqRepHelloWorldRequester
}
}

private:
private:

RequestListener& operator =(
const RequestListener&) = delete;

ReqRepHelloWorldRequester& requester_;

} request_listener_;
}
request_listener_;

ReqRepHelloWorldRequester();
virtual ~ReqRepHelloWorldRequester();
Expand Down
24 changes: 12 additions & 12 deletions test/blackbox/common/BlackboxTestsKeys.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ TEST(KeyedTopic, RegistrationFail)
PubSubWriter<KeyedHelloWorldPubSubType> writer(TEST_TOPIC_NAME);

writer.
resource_limits_max_instances(1).
init();
resource_limits_max_instances(1).
init();

ASSERT_TRUE(writer.isInitialized());

Expand All @@ -73,8 +73,8 @@ TEST(KeyedTopic, UnregistrationFail)
PubSubWriter<KeyedHelloWorldPubSubType> writer(TEST_TOPIC_NAME);

writer.
resource_limits_max_instances(1).
init();
resource_limits_max_instances(1).
init();

ASSERT_TRUE(writer.isInitialized());

Expand All @@ -91,8 +91,8 @@ TEST(KeyedTopic, DisposeFail)
PubSubWriter<KeyedHelloWorldPubSubType> writer(TEST_TOPIC_NAME);

writer.
resource_limits_max_instances(1).
init();
resource_limits_max_instances(1).
init();

ASSERT_TRUE(writer.isInitialized());

Expand All @@ -109,8 +109,8 @@ TEST(KeyedTopic, RegistrationAfterUnregistration)
PubSubWriter<KeyedHelloWorldPubSubType> writer(TEST_TOPIC_NAME);

writer.
resource_limits_max_instances(1).
init();
resource_limits_max_instances(1).
init();

ASSERT_TRUE(writer.isInitialized());

Expand All @@ -136,8 +136,8 @@ TEST(KeyedTopic, RegistrationAfterDispose)
PubSubWriter<KeyedHelloWorldPubSubType> writer(TEST_TOPIC_NAME);

writer.
resource_limits_max_instances(1).
init();
resource_limits_max_instances(1).
init();

ASSERT_TRUE(writer.isInitialized());

Expand All @@ -160,8 +160,8 @@ TEST(KeyedTopic, UnregisterWhenHistoryKeepAll)
PubSubWriter<KeyedHelloWorldPubSubType> writer(TEST_TOPIC_NAME);

writer.
history_kind(eprosima::fastrtps::KEEP_ALL_HISTORY_QOS).
init();
history_kind(eprosima::fastrtps::KEEP_ALL_HISTORY_QOS).
init();

ASSERT_TRUE(writer.isInitialized());

Expand Down
5 changes: 3 additions & 2 deletions test/blackbox/types/KeyedHelloWorldPubSubTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
#include "KeyedHelloWorld.h"

#if !defined(GEN_API_VER) || (GEN_API_VER != 1)
#error Generated KeyedHelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#error \
Generated KeyedHelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER

/*!
Expand Down Expand Up @@ -97,4 +98,4 @@ class KeyedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
unsigned char* m_keyBuffer;
};

#endif // _KEYEDHELLOWORLD_PUBSUBTYPES_H_
#endif // _KEYEDHELLOWORLD_PUBSUBTYPES_H_

0 comments on commit a343f0e

Please sign in to comment.