Skip to content

test: Add port validation check after openURL #64

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

Merged
patrickelectric merged 1 commit into from
Feb 24, 2025
Merged

test: Add port validation check after openURL #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/hal/link/desktop/abstract-link.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const char* AbstractLink::_urlStringRegex = R"((?P<type>udp|serial):(?P<host>.*)
std::shared_ptr<AbstractLink> AbstractLink::openUrl(const std::string& url)
{
if (url.empty()) {
std::cerr << "Empty URL was provided when trying to open a link" << std::endl;
return {};
}

Expand All @@ -30,6 +31,7 @@ std::shared_ptr<AbstractLink> AbstractLink::openUrl(const std::string& url)
} urlStruct;

if (!regex_search(url, match, regex)) {
std::cerr << "Invalid URL provided, should be in format `type:host:config`" << std::endl;
return {};
}

Expand All @@ -46,5 +48,6 @@ std::shared_ptr<AbstractLink> AbstractLink::openUrl(const std::string& url)
return std::make_shared<UdpLink>(urlStruct.host, urlStruct.config);
}

std::cerr << "Unknown link type provided" << std::endl;
return {};
}
4 changes: 4 additions & 0 deletions test/test-device-ping1d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ int main(int argc, char* argv[])
}

auto port = AbstractLink::openUrl(CommandLine::self()->connectionString);
if (!port) {
std::cerr << "Failed to open communication link with device" << std::endl;
return -1;
Copy link
Copy Markdown
Member

@patrickelectric patrickelectric Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice to add a message inside the AbstractLink as well to print the reason

Copy link
Copy Markdown
Contributor Author

@joaomariolago joaomariolago Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added message in different return paths from openURL plus the failed to open since the regex can be valid and still fails to open the port.

}
Ping1d device = Ping1d(*port.get());

// Basic information
Expand Down
4 changes: 4 additions & 0 deletions test/test-device-ping360.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ int main(int argc, char* argv[])
}

auto port = AbstractLink::openUrl(CommandLine::self()->connectionString);
if (!port) {
std::cerr << "Failed to open communication link with device" << std::endl;
return -1;
}
Ping360 device = Ping360(*port.get());

// Basic information
Expand Down
4 changes: 4 additions & 0 deletions test/test-device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ int main(int argc, char* argv[])
}

auto port = AbstractLink::openUrl(CommandLine::self()->connectionString);
if (!port) {
std::cerr << "Failed to open communication link with device" << std::endl;
return -1;
}
PingDevice device = PingDevice(*port.get());

// Basic information
Expand Down
Loading