From 6540a2a9d69432c4cc475e3b32eae11e9e0ace73 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 11 四月 2019 20:28:10 +0800
Subject: [PATCH] 1.srs的分辨率在config.json配置 2.单播推流控制，国标摄像机差一个关闭测试 3. 底库字段添加
---
QiaoJiaSystem/UnitTest/BasicStruct_test.cpp | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/UnitTest/BasicStruct_test.cpp b/QiaoJiaSystem/UnitTest/BasicStruct_test.cpp
index 3d57043..f4184c6 100644
--- a/QiaoJiaSystem/UnitTest/BasicStruct_test.cpp
+++ b/QiaoJiaSystem/UnitTest/BasicStruct_test.cpp
@@ -80,4 +80,21 @@
CHECK(AppUtil::IsRightAfterLeft(firstTime,secondTime));
CHECK_FALSE(AppUtil::IsRightAfterLeft(secondTime,firstTime));
+}
+
+TEST_CASE("BetweenLimit"){
+ std::string strImageKey ="DS-2CD5026EFWD20180202AACH181129936$2019-02-01-09-49-35_1588152";
+ std::string strVideoName = "DS-2CD5026EFWD20180202AACH181129936$2019-02-01-09-49-35_1587925_1588424.mp4";
+
+ ImageName_s_t imgSt = ImageName_s_t::fromString(strImageKey);
+ VideoName_s_t videoSt = VideoName_s_t::fromString(strVideoName);
+ CHECK(imgSt.Valid());
+ CHECK(videoSt.Valid());
+ CHECK((imgSt.m_frameId < videoSt.m_endFrameId));
+ CHECK(imgSt.m_frameId > videoSt.m_startFrameId);
+ auto firstTime = AppUtil::ParseFromHypenTimeStr(imgSt.m_timeStamp);
+ auto secondTime = AppUtil::ParseFromHypenTimeStr(videoSt.m_timeStamp);
+ CHECK(AppUtil::IsRightAfterLeft(firstTime,secondTime));
+ //CHECK_FALSE(AppUtil::IsRightAfterLeft(secondTime,firstTime));
+
}
\ No newline at end of file
--
Gitblit v1.8.0