From b5d466f3d22e3e483e8dab8bfac9d30e6aae720f Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 15 Sep 2016 14:47:42 +0800
Subject: [PATCH] update utest

---
 trunk/src/app/srs_app_config.hpp     |  1 +
 trunk/src/utest/srs_utest_config.cpp |  5 +++++
 trunk/src/utest/srs_utest_reload.cpp | 25 ++++++++-----------------
 trunk/src/utest/srs_utest_reload.hpp |  5 +----
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp
index fa12a889d..6a7a6324f 100644
--- a/trunk/src/app/srs_app_config.hpp
+++ b/trunk/src/app/srs_app_config.hpp
@@ -344,6 +344,7 @@ private:
     * if reload, reload the config file.
     */
     std::string config_file;
+protected:
     /**
     * the directive root.
     */
diff --git a/trunk/src/utest/srs_utest_config.cpp b/trunk/src/utest/srs_utest_config.cpp
index 51bafbd07..363dc2fbe 100644
--- a/trunk/src/utest/srs_utest_config.cpp
+++ b/trunk/src/utest/srs_utest_config.cpp
@@ -72,6 +72,11 @@ int MockSrsConfig::parse(string buf)
     if ((ret = parse_buffer(&buffer)) != ERROR_SUCCESS) {
         return ret;
     }
+    
+    if ((ret = srs_config_transform_vhost(root)) != ERROR_SUCCESS) {
+        srs_error("transform config failed. ret=%d", ret);
+        return ret;
+    }
 
     return check_config();
 }
diff --git a/trunk/src/utest/srs_utest_reload.cpp b/trunk/src/utest/srs_utest_reload.cpp
index 9430e1251..6163754e0 100644
--- a/trunk/src/utest/srs_utest_reload.cpp
+++ b/trunk/src/utest/srs_utest_reload.cpp
@@ -52,10 +52,7 @@ void MockReloadHandler::reset()
     vhost_http_updated_reloaded = false;
     vhost_added_reloaded = false;
     vhost_removed_reloaded = false;
-    vhost_atc_reloaded = false;
-    vhost_gop_cache_reloaded = false;
-    vhost_queue_length_reloaded = false;
-    vhost_time_jitter_reloaded = false;
+    vhost_play_reloaded = false;
     vhost_forward_reloaded = false;
     vhost_hls_reloaded = false;
     vhost_dvr_reloaded = false;
@@ -88,10 +85,7 @@ int MockReloadHandler::count_true()
     if (vhost_http_updated_reloaded) count_true++;
     if (vhost_added_reloaded) count_true++;
     if (vhost_removed_reloaded) count_true++;
-    if (vhost_atc_reloaded) count_true++;
-    if (vhost_gop_cache_reloaded) count_true++;
-    if (vhost_queue_length_reloaded) count_true++;
-    if (vhost_time_jitter_reloaded) count_true++;
+    if (vhost_play_reloaded) count_true++;
     if (vhost_forward_reloaded) count_true++;
     if (vhost_hls_reloaded) count_true++;
     if (vhost_dvr_reloaded) count_true++;
@@ -121,10 +115,7 @@ int MockReloadHandler::count_false()
     if (!vhost_http_updated_reloaded) count_false++;
     if (!vhost_added_reloaded) count_false++;
     if (!vhost_removed_reloaded) count_false++;
-    if (!vhost_atc_reloaded) count_false++;
-    if (!vhost_gop_cache_reloaded) count_false++;
-    if (!vhost_queue_length_reloaded) count_false++;
-    if (!vhost_time_jitter_reloaded) count_false++;
+    if (!vhost_play_reloaded) count_false++;
     if (!vhost_forward_reloaded) count_false++;
     if (!vhost_hls_reloaded) count_false++;
     if (!vhost_dvr_reloaded) count_false++;
@@ -232,7 +223,7 @@ int MockReloadHandler::on_reload_vhost_removed(string /*vhost*/)
 
 int MockReloadHandler::on_reload_vhost_play(string /*vhost*/)
 {
-    vhost_time_jitter_reloaded = true;
+    vhost_play_reloaded = true;
     return ERROR_SUCCESS;
 }
 
@@ -664,7 +655,7 @@ VOID TEST(ConfigReloadTest, ReloadVhostAtc)
     handler.reset();
     
     EXPECT_TRUE(ERROR_SUCCESS == conf.do_reload(_MIN_OK_CONF"vhost a{atc on;}"));
-    EXPECT_TRUE(handler.vhost_atc_reloaded);
+    EXPECT_TRUE(handler.vhost_play_reloaded);
     EXPECT_EQ(1, handler.count_true());
     handler.reset();
     
@@ -685,7 +676,7 @@ VOID TEST(ConfigReloadTest, ReloadVhostGopCache)
     handler.reset();
     
     EXPECT_TRUE(ERROR_SUCCESS == conf.do_reload(_MIN_OK_CONF"vhost a{gop_cache on;}"));
-    EXPECT_TRUE(handler.vhost_gop_cache_reloaded);
+    EXPECT_TRUE(handler.vhost_play_reloaded);
     EXPECT_EQ(1, handler.count_true());
     handler.reset();
     
@@ -706,7 +697,7 @@ VOID TEST(ConfigReloadTest, ReloadVhostQueueLength)
     handler.reset();
     
     EXPECT_TRUE(ERROR_SUCCESS == conf.do_reload(_MIN_OK_CONF"vhost a{queue_length 20;}"));
-    EXPECT_TRUE(handler.vhost_queue_length_reloaded);
+    EXPECT_TRUE(handler.vhost_play_reloaded);
     EXPECT_EQ(1, handler.count_true());
     handler.reset();
     
@@ -727,7 +718,7 @@ VOID TEST(ConfigReloadTest, ReloadVhostTimeJitter)
     handler.reset();
     
     EXPECT_TRUE(ERROR_SUCCESS == conf.do_reload(_MIN_OK_CONF"vhost a{time_jitter zero;}"));
-    EXPECT_TRUE(handler.vhost_time_jitter_reloaded);
+    EXPECT_TRUE(handler.vhost_play_reloaded);
     EXPECT_EQ(1, handler.count_true());
     handler.reset();
     
diff --git a/trunk/src/utest/srs_utest_reload.hpp b/trunk/src/utest/srs_utest_reload.hpp
index ecdebaae8..4b4db2d42 100644
--- a/trunk/src/utest/srs_utest_reload.hpp
+++ b/trunk/src/utest/srs_utest_reload.hpp
@@ -49,10 +49,7 @@ public:
     bool vhost_http_updated_reloaded;
     bool vhost_added_reloaded;
     bool vhost_removed_reloaded;
-    bool vhost_atc_reloaded;
-    bool vhost_gop_cache_reloaded;
-    bool vhost_queue_length_reloaded;
-    bool vhost_time_jitter_reloaded;
+    bool vhost_play_reloaded;
     bool vhost_forward_reloaded;
     bool vhost_hls_reloaded;
     bool vhost_dvr_reloaded;