Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor ConfigTransports test #3637

Closed
wants to merge 4 commits into from
Closed

Refactor ConfigTransports test #3637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
768b4c8
Minor changes
sonndinh Jul 27, 2022
ebe1853
Add to tsan test list
sonndinh Jul 27, 2022
7d47a70
Fix lint
sonndinh Jul 27, 2022
d440787
Fix compile errors
sonndinh Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions tests/DCPS/ConfigTransports/DDSTEST.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,15 @@ ::DDS_TEST::negotiated(const OpenDDS::DCPS::TransportClient* ctc, const OPENDDS_

if (datalink->impl().config().name() == name)
{
// ACE_DEBUG((LM_DEBUG,
// ACE_TEXT("(%P|%t) Yes. Transport '%C' was negotiated.\n"),
// name.c_str()));
ACE_DEBUG((LM_DEBUG,
ACE_TEXT("(%P|%t) Yes. Transport '%C' was negotiated.\n"),
name.c_str()));
return true;
}
}

// ACE_DEBUG((LM_DEBUG,
// ACE_TEXT("(%P|%t) No. Transport '%C' was not negotiated.\n"),
// name.c_str()));
ACE_DEBUG((LM_DEBUG,
ACE_TEXT("(%P|%t) No. Transport '%C' was not negotiated.\n"),
name.c_str()));
return false;
}
28 changes: 14 additions & 14 deletions tests/DCPS/ConfigTransports/Factory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,20 @@ Factory::topic(const DDS::DomainParticipant_var& dp) const

// When collocation doesn't matter we choose a topic name that will not match
// the publisher's topic name
std::string topicname((opts_.collocation_str == "none") ? MY_OTHER_TOPIC : MY_SAME_TOPIC);
std::string topic_name((opts_.collocation_str == "none") ? MY_OTHER_TOPIC : MY_SAME_TOPIC);

DDS::TopicQos topic_qos;
TEST_CHECK(DDS::RETCODE_OK == dp->get_default_topic_qos(topic_qos));

CORBA::String_var tn = typsup_->get_type_name();
ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t) Topic name: %C\n"), tn.in()));
DDS::Topic_var p(dp->create_topic(topicname.c_str(),
tn,
TOPIC_QOS_DEFAULT,
DDS::TopicListener::_nil(),
OpenDDS::DCPS::DEFAULT_STATUS_MASK));
TEST_CHECK(!CORBA::is_nil(p.in()));
return p;
CORBA::String_var type_name = typsup_->get_type_name();
ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t) Topic type name: %C\n"), type_name.in()));
DDS::Topic_var topic(dp->create_topic(topic_name.c_str(),
type_name,
TOPIC_QOS_DEFAULT,
DDS::TopicListener::_nil(),
OpenDDS::DCPS::DEFAULT_STATUS_MASK));
TEST_CHECK(!CORBA::is_nil(topic.in()));
return topic;
}

DDS::Publisher_var
Expand Down Expand Up @@ -168,7 +168,7 @@ Factory::reader(const DDS::Subscriber_var& sub, const DDS::Topic_var& topic, con
DDS::TopicDescription_var description = dp->lookup_topicdescription(tn);
TEST_ASSERT(!CORBA::is_nil(description.in()));

DDS::DataReader_var rd(sub->create_datareader(description.in(),
DDS::DataReader_var dr(sub->create_datareader(description.in(),
dr_qos,
drl.in(),
::OpenDDS::DCPS::DEFAULT_STATUS_MASK));
Expand All @@ -179,12 +179,12 @@ Factory::reader(const DDS::Subscriber_var& sub, const DDS::Topic_var& topic, con
{

OpenDDS::DCPS::TransportRegistry::instance()->bind_config(opts_.configuration_str,
rd.in());
dr.in());
if (!opts_.entity_autoenable)
{
TEST_ASSERT(DDS::RETCODE_OK == rd->enable());
TEST_ASSERT(DDS::RETCODE_OK == dr->enable());
}
}

return rd;
return dr;
}