diff options
author | Elliott Hughes <enh@google.com> | 2019-07-30 13:51:03 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2019-07-30 21:55:56 -0700 |
commit | 14d673e3ef097cbabe3c3e2ac7f62cda57809dfd (patch) | |
tree | d79f7d8ae2e4ae482e0cf0a7d6b513196cc96349 /socket_spec_test.cpp | |
parent | 835d90e88b019cc0661d6702940b4f7145a80318 (diff) | |
download | adb-14d673e3ef097cbabe3c3e2ac7f62cda57809dfd.tar.gz |
Restore default port for `adb connect`.
The default port of 5555 was removed a while back, but the help text was
never updated, and other contexts still allow a default port.
Bug: https://issuetracker.google.com/128561172
Test: manual
Change-Id: I6e5e6edeb2243386a0301c0a6cad569189f9910e
Diffstat (limited to 'socket_spec_test.cpp')
-rw-r--r-- | socket_spec_test.cpp | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/socket_spec_test.cpp b/socket_spec_test.cpp index f5ec0f15..3a2f60c3 100644 --- a/socket_spec_test.cpp +++ b/socket_spec_test.cpp @@ -20,38 +20,71 @@ #include <gtest/gtest.h> -TEST(socket_spec, parse_tcp_socket_spec) { +TEST(socket_spec, parse_tcp_socket_spec_just_port) { std::string hostname, error, serial; int port; EXPECT_TRUE(parse_tcp_socket_spec("tcp:5037", &hostname, &port, &serial, &error)); EXPECT_EQ("", hostname); EXPECT_EQ(5037, port); EXPECT_EQ("", serial); +} - // Bad ports: +TEST(socket_spec, parse_tcp_socket_spec_bad_ports) { + std::string hostname, error, serial; + int port; EXPECT_FALSE(parse_tcp_socket_spec("tcp:", &hostname, &port, &serial, &error)); EXPECT_FALSE(parse_tcp_socket_spec("tcp:-1", &hostname, &port, &serial, &error)); EXPECT_FALSE(parse_tcp_socket_spec("tcp:65536", &hostname, &port, &serial, &error)); +} +TEST(socket_spec, parse_tcp_socket_spec_host_and_port) { + std::string hostname, error, serial; + int port; EXPECT_TRUE(parse_tcp_socket_spec("tcp:localhost:1234", &hostname, &port, &serial, &error)); EXPECT_EQ("localhost", hostname); EXPECT_EQ(1234, port); EXPECT_EQ("localhost:1234", serial); +} - EXPECT_FALSE(parse_tcp_socket_spec("tcp:localhost", &hostname, &port, &serial, &error)); +TEST(socket_spec, parse_tcp_socket_spec_host_no_port) { + std::string hostname, error, serial; + int port; + EXPECT_TRUE(parse_tcp_socket_spec("tcp:localhost", &hostname, &port, &serial, &error)); + EXPECT_EQ("localhost", hostname); + EXPECT_EQ(5555, port); + EXPECT_EQ("localhost:5555", serial); +} + +TEST(socket_spec, parse_tcp_socket_spec_host_bad_ports) { + std::string hostname, error, serial; + int port; EXPECT_FALSE(parse_tcp_socket_spec("tcp:localhost:", &hostname, &port, &serial, &error)); EXPECT_FALSE(parse_tcp_socket_spec("tcp:localhost:-1", &hostname, &port, &serial, &error)); EXPECT_FALSE(parse_tcp_socket_spec("tcp:localhost:65536", &hostname, &port, &serial, &error)); +} - // IPv6: +TEST(socket_spec, parse_tcp_socket_spec_ipv6_and_port) { + std::string hostname, error, serial; + int port; EXPECT_TRUE(parse_tcp_socket_spec("tcp:[::1]:1234", &hostname, &port, &serial, &error)); EXPECT_EQ("::1", hostname); EXPECT_EQ(1234, port); EXPECT_EQ("[::1]:1234", serial); +} + +TEST(socket_spec, parse_tcp_socket_spec_ipv6_no_port) { + std::string hostname, error, serial; + int port; + EXPECT_TRUE(parse_tcp_socket_spec("tcp:::1", &hostname, &port, &serial, &error)); + EXPECT_EQ("::1", hostname); + EXPECT_EQ(5555, port); + EXPECT_EQ("[::1]:5555", serial); +} +TEST(socket_spec, parse_tcp_socket_spec_ipv6_bad_ports) { + std::string hostname, error, serial; + int port; EXPECT_FALSE(parse_tcp_socket_spec("tcp:[::1]", &hostname, &port, &serial, &error)); EXPECT_FALSE(parse_tcp_socket_spec("tcp:[::1]:", &hostname, &port, &serial, &error)); EXPECT_FALSE(parse_tcp_socket_spec("tcp:[::1]:-1", &hostname, &port, &serial, &error)); - EXPECT_FALSE(parse_tcp_socket_spec("tcp:::1", &hostname, &port, &serial, &error)); - EXPECT_FALSE(parse_tcp_socket_spec("tcp:::1:1234", &hostname, &port, &serial, &error)); } |