胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
75be1813 1 parent 6df4d1f0

fix build failed for utest.

内嵌 并排对比
正在显示 1 个修改的文件 包含 13 行增加 和 13 行删除
@@ -463,7 +463,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl) @@ -463,7 +463,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl)
463 { 463 {
464 std::string tcUrl; 464 std::string tcUrl;
465 std::string schema; std::string host; std::string vhost; 465 std::string schema; std::string host; std::string vhost;
466 - std::string app; std::string port; std::string param; 466 + std::string app; int port; std::string param;
467 467
468 tcUrl = "rtmp://127.0.0.1:1935/live"; 468 tcUrl = "rtmp://127.0.0.1:1935/live";
469 srs_discovery_tc_url(tcUrl, schema, host, vhost, app, port, param); 469 srs_discovery_tc_url(tcUrl, schema, host, vhost, app, port, param);
@@ -471,7 +471,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl) @@ -471,7 +471,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl)
471 EXPECT_STREQ("127.0.0.1", host.c_str()); 471 EXPECT_STREQ("127.0.0.1", host.c_str());
472 EXPECT_STREQ("127.0.0.1", vhost.c_str()); 472 EXPECT_STREQ("127.0.0.1", vhost.c_str());
473 EXPECT_STREQ("live", app.c_str()); 473 EXPECT_STREQ("live", app.c_str());
474 - EXPECT_STREQ("1935", port.c_str()); 474 + EXPECT_EQ(1935, port);
475 475
476 tcUrl = "rtmp://127.0.0.1:19351/live"; 476 tcUrl = "rtmp://127.0.0.1:19351/live";
477 srs_discovery_tc_url(tcUrl, schema, host, vhost, app, port, param); 477 srs_discovery_tc_url(tcUrl, schema, host, vhost, app, port, param);
@@ -479,7 +479,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl) @@ -479,7 +479,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl)
479 EXPECT_STREQ("127.0.0.1", host.c_str()); 479 EXPECT_STREQ("127.0.0.1", host.c_str());
480 EXPECT_STREQ("127.0.0.1", vhost.c_str()); 480 EXPECT_STREQ("127.0.0.1", vhost.c_str());
481 EXPECT_STREQ("live", app.c_str()); 481 EXPECT_STREQ("live", app.c_str());
482 - EXPECT_STREQ("19351", port.c_str()); 482 + EXPECT_EQ(19351, port);
483 483
484 tcUrl = "rtmp://127.0.0.1:19351/live?vhost=demo"; 484 tcUrl = "rtmp://127.0.0.1:19351/live?vhost=demo";
485 srs_discovery_tc_url(tcUrl, schema, host, vhost, app, port, param); 485 srs_discovery_tc_url(tcUrl, schema, host, vhost, app, port, param);
@@ -487,7 +487,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl) @@ -487,7 +487,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl)
487 EXPECT_STREQ("127.0.0.1", host.c_str()); 487 EXPECT_STREQ("127.0.0.1", host.c_str());
488 EXPECT_STREQ("demo", vhost.c_str()); 488 EXPECT_STREQ("demo", vhost.c_str());
489 EXPECT_STREQ("live", app.c_str()); 489 EXPECT_STREQ("live", app.c_str());
490 - EXPECT_STREQ("19351", port.c_str()); 490 + EXPECT_EQ(19351, port);
491 491
492 tcUrl = "rtmp://127.0.0.1:19351/live/show?vhost=demo"; 492 tcUrl = "rtmp://127.0.0.1:19351/live/show?vhost=demo";
493 srs_discovery_tc_url(tcUrl, schema, host, vhost, app, port, param); 493 srs_discovery_tc_url(tcUrl, schema, host, vhost, app, port, param);
@@ -495,7 +495,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl) @@ -495,7 +495,7 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl)
495 EXPECT_STREQ("127.0.0.1", host.c_str()); 495 EXPECT_STREQ("127.0.0.1", host.c_str());
496 EXPECT_STREQ("demo", vhost.c_str()); 496 EXPECT_STREQ("demo", vhost.c_str());
497 EXPECT_STREQ("live/show", app.c_str()); 497 EXPECT_STREQ("live/show", app.c_str());
498 - EXPECT_STREQ("19351", port.c_str()); 498 + EXPECT_EQ(19351, port);
499 } 499 }
500 500
501 /** 501 /**
@@ -503,17 +503,17 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl) @@ -503,17 +503,17 @@ VOID TEST(ProtocolUtilityTest, DiscoveryTcUrl)
503 */ 503 */
504 VOID TEST(ProtocolUtilityTest, GenerateTcUrl) 504 VOID TEST(ProtocolUtilityTest, GenerateTcUrl)
505 { 505 {
506 - string ip; string vhost; string app; string port; string tcUrl; string param; 506 + string ip; string vhost; string app; int port; string tcUrl; string param;
507 507
508 - ip = "127.0.0.1"; vhost = "__defaultVhost__"; app = "live"; port = "1935"; 508 + ip = "127.0.0.1"; vhost = "__defaultVhost__"; app = "live"; port = 1935;
509 tcUrl = srs_generate_tc_url(ip, vhost, app, port, param); 509 tcUrl = srs_generate_tc_url(ip, vhost, app, port, param);
510 EXPECT_STREQ("rtmp://127.0.0.1/live", tcUrl.c_str()); 510 EXPECT_STREQ("rtmp://127.0.0.1/live", tcUrl.c_str());
511 511
512 - ip = "127.0.0.1"; vhost = "demo"; app = "live"; port = "1935"; 512 + ip = "127.0.0.1"; vhost = "demo"; app = "live"; port = 1935;
513 tcUrl = srs_generate_tc_url(ip, vhost, app, port, param); 513 tcUrl = srs_generate_tc_url(ip, vhost, app, port, param);
514 EXPECT_STREQ("rtmp://demo/live", tcUrl.c_str()); 514 EXPECT_STREQ("rtmp://demo/live", tcUrl.c_str());
515 515
516 - ip = "127.0.0.1"; vhost = "demo"; app = "live"; port = "19351"; 516 + ip = "127.0.0.1"; vhost = "demo"; app = "live"; port = 19351;
517 tcUrl = srs_generate_tc_url(ip, vhost, app, port, param); 517 tcUrl = srs_generate_tc_url(ip, vhost, app, port, param);
518 EXPECT_STREQ("rtmp://demo:19351/live", tcUrl.c_str()); 518 EXPECT_STREQ("rtmp://demo:19351/live", tcUrl.c_str());
519 } 519 }
@@ -5549,7 +5549,7 @@ VOID TEST(ProtocolRTMPTest, RTMPRequest) @@ -5549,7 +5549,7 @@ VOID TEST(ProtocolRTMPTest, RTMPRequest)
5549 EXPECT_STREQ("std.ossrs.net", req.host.c_str()); 5549 EXPECT_STREQ("std.ossrs.net", req.host.c_str());
5550 EXPECT_STREQ("std.ossrs.net", req.vhost.c_str()); 5550 EXPECT_STREQ("std.ossrs.net", req.vhost.c_str());
5551 EXPECT_STREQ("live", req.app.c_str()); 5551 EXPECT_STREQ("live", req.app.c_str());
5552 - EXPECT_STREQ("1935", req.port.c_str()); 5552 + EXPECT_EQ(1935, req.port);
5553 5553
5554 req.stream = "livestream"; 5554 req.stream = "livestream";
5555 srs_discovery_tc_url("rtmp://s td.os srs.n et/li v e", 5555 srs_discovery_tc_url("rtmp://s td.os srs.n et/li v e",
@@ -5559,7 +5559,7 @@ VOID TEST(ProtocolRTMPTest, RTMPRequest) @@ -5559,7 +5559,7 @@ VOID TEST(ProtocolRTMPTest, RTMPRequest)
5559 EXPECT_STREQ("std.ossrs.net", req.host.c_str()); 5559 EXPECT_STREQ("std.ossrs.net", req.host.c_str());
5560 EXPECT_STREQ("std.ossrs.net", req.vhost.c_str()); 5560 EXPECT_STREQ("std.ossrs.net", req.vhost.c_str());
5561 EXPECT_STREQ("live", req.app.c_str()); 5561 EXPECT_STREQ("live", req.app.c_str());
5562 - EXPECT_STREQ("1935", req.port.c_str()); 5562 + EXPECT_EQ(1935, req.port);
5563 5563
5564 req.stream = "livestream"; 5564 req.stream = "livestream";
5565 srs_discovery_tc_url("rtmp://s\ntd.o\rssrs.ne\nt/li\nve", 5565 srs_discovery_tc_url("rtmp://s\ntd.o\rssrs.ne\nt/li\nve",
@@ -5569,7 +5569,7 @@ VOID TEST(ProtocolRTMPTest, RTMPRequest) @@ -5569,7 +5569,7 @@ VOID TEST(ProtocolRTMPTest, RTMPRequest)
5569 EXPECT_STREQ("std.ossrs.net", req.host.c_str()); 5569 EXPECT_STREQ("std.ossrs.net", req.host.c_str());
5570 EXPECT_STREQ("std.ossrs.net", req.vhost.c_str()); 5570 EXPECT_STREQ("std.ossrs.net", req.vhost.c_str());
5571 EXPECT_STREQ("live", req.app.c_str()); 5571 EXPECT_STREQ("live", req.app.c_str());
5572 - EXPECT_STREQ("1935", req.port.c_str()); 5572 + EXPECT_EQ(1935, req.port);
5573 5573
5574 req.stream = "livestream"; 5574 req.stream = "livestream";
5575 srs_discovery_tc_url("rtmp://std.ossrs.net/live ", 5575 srs_discovery_tc_url("rtmp://std.ossrs.net/live ",
@@ -5579,7 +5579,7 @@ VOID TEST(ProtocolRTMPTest, RTMPRequest) @@ -5579,7 +5579,7 @@ VOID TEST(ProtocolRTMPTest, RTMPRequest)
5579 EXPECT_STREQ("std.ossrs.net", req.host.c_str()); 5579 EXPECT_STREQ("std.ossrs.net", req.host.c_str());
5580 EXPECT_STREQ("std.ossrs.net", req.vhost.c_str()); 5580 EXPECT_STREQ("std.ossrs.net", req.vhost.c_str());
5581 EXPECT_STREQ("live", req.app.c_str()); 5581 EXPECT_STREQ("live", req.app.c_str());
5582 - EXPECT_STREQ("1935", req.port.c_str()); 5582 + EXPECT_EQ(1935, req.port);
5583 5583
5584 EXPECT_TRUE(NULL == req.args); 5584 EXPECT_TRUE(NULL == req.args);
5585 SrsRequest req1; 5585 SrsRequest req1;