diff --git a/trunk/src/utest/srs_utest_protocol.cpp b/trunk/src/utest/srs_utest_protocol.cpp index ba5f8bd8c..01229d819 100644 --- a/trunk/src/utest/srs_utest_protocol.cpp +++ b/trunk/src/utest/srs_utest_protocol.cpp @@ -463,7 +463,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl) { std::string tcUrl; std::string schema; std::string host; std::string vhost; - std::string app; std::string port; std::string param; + std::string app; int port; std::string param; tcUrl = "rtmp://127.0.0.1:1935/live"; srs_discovery_tc_url(tcUrl, schema, host, vhost, app, port, param); @@ -471,7 +471,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl) EXPECT_STREQ("127.0.0.1", host.c_str()); EXPECT_STREQ("127.0.0.1", vhost.c_str()); EXPECT_STREQ("live", app.c_str()); - EXPECT_STREQ("1935", port.c_str()); + EXPECT_EQ(1935, port); tcUrl = "rtmp://127.0.0.1:19351/live"; srs_discovery_tc_url(tcUrl, schema, host, vhost, app, port, param); @@ -479,7 +479,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl) EXPECT_STREQ("127.0.0.1", host.c_str()); EXPECT_STREQ("127.0.0.1", vhost.c_str()); EXPECT_STREQ("live", app.c_str()); - EXPECT_STREQ("19351", port.c_str()); + EXPECT_EQ(19351, port); tcUrl = "rtmp://127.0.0.1:19351/live?vhost=demo"; srs_discovery_tc_url(tcUrl, schema, host, vhost, app, port, param); @@ -487,7 +487,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl) EXPECT_STREQ("127.0.0.1", host.c_str()); EXPECT_STREQ("demo", vhost.c_str()); EXPECT_STREQ("live", app.c_str()); - EXPECT_STREQ("19351", port.c_str()); + EXPECT_EQ(19351, port); tcUrl = "rtmp://127.0.0.1:19351/live/show?vhost=demo"; srs_discovery_tc_url(tcUrl, schema, host, vhost, app, port, param); @@ -495,7 +495,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl) EXPECT_STREQ("127.0.0.1", host.c_str()); EXPECT_STREQ("demo", vhost.c_str()); EXPECT_STREQ("live/show", app.c_str()); - EXPECT_STREQ("19351", port.c_str()); + EXPECT_EQ(19351, port); } /** @@ -503,17 +503,17 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl) */ VOID TEST(ProtocolUtilityTest, GenerateTcUrl) { - string ip; string vhost; string app; string port; string tcUrl; string param; + string ip; string vhost; string app; int port; string tcUrl; string param; - ip = "127.0.0.1"; vhost = "__defaultVhost__"; app = "live"; port = "1935"; + ip = "127.0.0.1"; vhost = "__defaultVhost__"; app = "live"; port = 1935; tcUrl = srs_generate_tc_url(ip, vhost, app, port, param); EXPECT_STREQ("rtmp://127.0.0.1/live", tcUrl.c_str()); - ip = "127.0.0.1"; vhost = "demo"; app = "live"; port = "1935"; + ip = "127.0.0.1"; vhost = "demo"; app = "live"; port = 1935; tcUrl = srs_generate_tc_url(ip, vhost, app, port, param); EXPECT_STREQ("rtmp://demo/live", tcUrl.c_str()); - ip = "127.0.0.1"; vhost = "demo"; app = "live"; port = "19351"; + ip = "127.0.0.1"; vhost = "demo"; app = "live"; port = 19351; tcUrl = srs_generate_tc_url(ip, vhost, app, port, param); EXPECT_STREQ("rtmp://demo:19351/live", tcUrl.c_str()); } @@ -5549,7 +5549,7 @@ VOID TEST(ProtocolRTMPTest, RTMPRequest) EXPECT_STREQ("std.ossrs.net", req.host.c_str()); EXPECT_STREQ("std.ossrs.net", req.vhost.c_str()); EXPECT_STREQ("live", req.app.c_str()); - EXPECT_STREQ("1935", req.port.c_str()); + EXPECT_EQ(1935, req.port); req.stream = "livestream"; srs_discovery_tc_url("rtmp://s td.os srs.n et/li v e", @@ -5559,7 +5559,7 @@ VOID TEST(ProtocolRTMPTest, RTMPRequest) EXPECT_STREQ("std.ossrs.net", req.host.c_str()); EXPECT_STREQ("std.ossrs.net", req.vhost.c_str()); EXPECT_STREQ("live", req.app.c_str()); - EXPECT_STREQ("1935", req.port.c_str()); + EXPECT_EQ(1935, req.port); req.stream = "livestream"; srs_discovery_tc_url("rtmp://s\ntd.o\rssrs.ne\nt/li\nve", @@ -5569,7 +5569,7 @@ VOID TEST(ProtocolRTMPTest, RTMPRequest) EXPECT_STREQ("std.ossrs.net", req.host.c_str()); EXPECT_STREQ("std.ossrs.net", req.vhost.c_str()); EXPECT_STREQ("live", req.app.c_str()); - EXPECT_STREQ("1935", req.port.c_str()); + EXPECT_EQ(1935, req.port); req.stream = "livestream"; srs_discovery_tc_url("rtmp://std.ossrs.net/live ", @@ -5579,7 +5579,7 @@ VOID TEST(ProtocolRTMPTest, RTMPRequest) EXPECT_STREQ("std.ossrs.net", req.host.c_str()); EXPECT_STREQ("std.ossrs.net", req.vhost.c_str()); EXPECT_STREQ("live", req.app.c_str()); - EXPECT_STREQ("1935", req.port.c_str()); + EXPECT_EQ(1935, req.port); EXPECT_TRUE(NULL == req.args); SrsRequest req1;