Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-11-06 10:26:18 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
75be18133d3c8145156da60dfe97871ee04022bd
75be1813
1 parent
6df4d1f0
fix build failed for utest.
显示空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
13 行增加
和
13 行删除
trunk/src/utest/srs_utest_protocol.cpp
trunk/src/utest/srs_utest_protocol.cpp
查看文件 @
75be181
...
...
@@ -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
\n
td.o
\r
ssrs.ne
\n
t/li
\n
ve"
,
...
...
@@ -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
;
...
...
请
注册
或
登录
后发表评论