2.0.0.2:

- Updated layer_test.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@239 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/test/core/renderer/layer_test.cpp b/test/core/renderer/layer_test.cpp
index fd1b34df8ade14956982504a0e1df12fe44b63e6..ff7f67203e906390042bb91d923979f71f7526d0 100644 (file)
--- a/test/core/renderer/layer_test.cpp
+++ b/test/core/renderer/layer_test.cpp
@@ -10,38 +10,38 @@
 using namespace caspar;\r
 using namespace caspar::core;\r
 \r
-TEST(layer_test, load_nullptr) \r
+TEST(layer, load_nullptr) \r
 {\r
        core::renderer::layer layer;\r
 \r
        ASSERT_THROW(layer.load(nullptr), null_argument);\r
 }\r
 \r
-TEST(layer_test, load)\r
+TEST(layer, load)\r
 {      \r
        core::renderer::layer layer;\r
        auto background = std::make_shared<mock_frame_producer>();\r
 \r
        layer.load(background);\r
        \r
-       ASSERT_TRUE(layer.get_frame() == nullptr);\r
+       ASSERT_TRUE(layer.render_frame() == nullptr);\r
        ASSERT_TRUE(layer.active() == nullptr);\r
        ASSERT_TRUE(layer.background() == background);\r
 }\r
 \r
-TEST(layer_test, load_auto_play)\r
+TEST(layer, load_auto_play)\r
 {      \r
        core::renderer::layer layer;\r
        auto active = std::make_shared<mock_frame_producer>();\r
 \r
        layer.load(active, renderer::load_option::auto_play);\r
                \r
-       ASSERT_TRUE(layer.get_frame() != nullptr);\r
+       ASSERT_TRUE(layer.render_frame() != nullptr);\r
        ASSERT_TRUE(layer.active() == active);\r
        ASSERT_TRUE(layer.background() == nullptr);\r
 }\r
 \r
-TEST(layer_test, load_active)\r
+TEST(layer, load_active)\r
 {      \r
        core::renderer::layer layer;\r
        auto active = std::make_shared<mock_frame_producer>();\r
@@ -50,28 +50,28 @@ TEST(layer_test, load_active)
        layer.load(active, renderer::load_option::auto_play);\r
        layer.load(background);\r
        \r
-       ASSERT_TRUE(layer.get_frame() != nullptr);\r
+       ASSERT_TRUE(layer.render_frame() != nullptr);\r
        ASSERT_TRUE(layer.active() == active);\r
        ASSERT_TRUE(layer.background() == background);\r
 }\r
 \r
-TEST(layer_test, load_preview)\r
+TEST(layer, load_preview)\r
 {      \r
        core::renderer::layer layer;\r
        auto background = std::make_shared<mock_frame_producer>();\r
 \r
        layer.load(background, renderer::load_option::preview);\r
 \r
-       auto frame = layer.get_frame();\r
+       auto frame = layer.render_frame();\r
        \r
        ASSERT_TRUE(frame != nullptr);\r
-       ASSERT_TRUE(layer.get_frame() == frame);\r
+       ASSERT_TRUE(layer.render_frame() == frame);\r
        ASSERT_TRUE(layer.active() == nullptr);\r
        ASSERT_TRUE(layer.background() == background);\r
        ASSERT_TRUE(frame->audio_data().empty());\r
 }\r
 \r
-TEST(layer_test, load_preview_active)\r
+TEST(layer, load_preview_active)\r
 {      \r
        core::renderer::layer layer;\r
        auto active = std::make_shared<mock_frame_producer>();\r
@@ -80,15 +80,15 @@ TEST(layer_test, load_preview_active)
        layer.load(active, renderer::load_option::auto_play);\r
        layer.load(background, renderer::load_option::preview);\r
                \r
-       auto frame = layer.get_frame();\r
+       auto frame = layer.render_frame();\r
 \r
        ASSERT_TRUE(frame != nullptr);\r
-       ASSERT_TRUE(layer.get_frame() == frame);\r
+       ASSERT_TRUE(layer.render_frame() == frame);\r
        ASSERT_TRUE(layer.active() == nullptr);\r
        ASSERT_TRUE(layer.background() == background);\r
 }\r
 \r
-TEST(layer_test, load_play)\r
+TEST(layer, load_play)\r
 {      \r
        core::renderer::layer layer;\r
        auto active = std::make_shared<mock_frame_producer>();\r
@@ -96,43 +96,43 @@ TEST(layer_test, load_play)
        layer.load(active);\r
        layer.play();\r
        \r
-       ASSERT_TRUE(layer.get_frame() != nullptr);\r
+       ASSERT_TRUE(layer.render_frame() != nullptr);\r
        ASSERT_TRUE(layer.active() == active);\r
        ASSERT_TRUE(layer.background() == nullptr);\r
 }\r
 \r
 \r
-TEST(layer_test, load_play2)\r
+TEST(layer, empty_play)\r
 {      \r
        core::renderer::layer layer;\r
        layer.play();\r
 \r
-       auto frame = layer.get_frame();\r
+       auto frame = layer.render_frame();\r
 \r
        ASSERT_TRUE(frame == nullptr);\r
 }\r
 \r
-TEST(layer_test, pause)\r
+TEST(layer, pause)\r
 {\r
        core::renderer::layer layer;\r
        auto active = std::make_shared<mock_frame_producer>();\r
 \r
        layer.load(active, renderer::load_option::auto_play);\r
        \r
-       auto frame = layer.get_frame();\r
+       auto frame = layer.render_frame();\r
 \r
        layer.pause();\r
        \r
        ASSERT_TRUE(layer.active() == active);\r
-       ASSERT_TRUE(layer.get_frame() == frame);\r
+       ASSERT_TRUE(layer.render_frame() == frame);\r
 \r
        layer.play();\r
        \r
        ASSERT_TRUE(layer.active() == active);\r
-       ASSERT_TRUE(layer.get_frame() != frame);\r
+       ASSERT_TRUE(layer.render_frame() != frame);\r
 }\r
 \r
-TEST(layer_test, stop)\r
+TEST(layer, stop)\r
 {\r
        core::renderer::layer layer;\r
        auto active = std::make_shared<mock_frame_producer>();\r
@@ -140,16 +140,16 @@ TEST(layer_test, stop)
 \r
        layer.load(active, renderer::load_option::auto_play);\r
        layer.load(background, renderer::load_option::preview);\r
-       layer.get_frame();\r
+       layer.render_frame();\r
 \r
        layer.stop();\r
                \r
-       ASSERT_TRUE(layer.get_frame() == nullptr);\r
+       ASSERT_TRUE(layer.render_frame() == nullptr);\r
        ASSERT_TRUE(layer.active() == nullptr);\r
        ASSERT_TRUE(layer.background() == background);;\r
 }\r
 \r
-TEST(layer_test, clear)\r
+TEST(layer, clear)\r
 {\r
        core::renderer::layer layer;\r
        auto active = std::make_shared<mock_frame_producer>();\r
@@ -159,50 +159,50 @@ TEST(layer_test, clear)
        layer.load(background, renderer::load_option::preview);\r
        layer.clear();\r
                \r
-       ASSERT_TRUE(layer.get_frame() == nullptr);\r
+       ASSERT_TRUE(layer.render_frame() == nullptr);\r
        ASSERT_TRUE(layer.active() == nullptr);\r
        ASSERT_TRUE(layer.background() == nullptr);\r
 }\r
 \r
-TEST(layer_test, following_producer)\r
+TEST(layer, following_producer)\r
 {\r
        core::renderer::layer layer;\r
        auto active = std::make_shared<mock_frame_producer>(true);\r
        auto following = std::make_shared<mock_frame_producer>();\r
        layer.load(active, renderer::load_option::auto_play);\r
                \r
-       ASSERT_TRUE(layer.get_frame() == nullptr);\r
+       ASSERT_TRUE(layer.render_frame() == nullptr);\r
        ASSERT_TRUE(layer.active() == nullptr);\r
                \r
        layer.load(active, renderer::load_option::auto_play);\r
        active->set_following_producer(following);\r
        \r
-       ASSERT_TRUE(layer.get_frame() != nullptr);\r
+       ASSERT_TRUE(layer.render_frame() != nullptr);\r
        ASSERT_TRUE(layer.active() == following);\r
 }\r
 \r
-TEST(layer_test, leading_producer)\r
+TEST(layer, leading_producer)\r
 {\r
        core::renderer::layer layer;\r
        auto active = std::make_shared<mock_frame_producer>();\r
        auto active2 = std::make_shared<mock_frame_producer>();\r
        layer.load(active, renderer::load_option::auto_play);\r
                \r
-       ASSERT_TRUE(layer.get_frame() != nullptr);\r
+       ASSERT_TRUE(layer.render_frame() != nullptr);\r
        ASSERT_TRUE(layer.active() == active);\r
                \r
        layer.load(active2, renderer::load_option::auto_play);\r
        \r
-       ASSERT_TRUE(layer.get_frame() != nullptr);\r
+       ASSERT_TRUE(layer.render_frame() != nullptr);\r
        ASSERT_TRUE(layer.active() == active2);\r
 }\r
 \r
-TEST(layer_test, get_frame_exception)\r
+TEST(layer, get_frame_exception)\r
 {\r
        core::renderer::layer layer;\r
        auto active = std::make_shared<mock_frame_producer>(false, true);\r
        layer.load(active, renderer::load_option::auto_play);\r
                        \r
-       ASSERT_TRUE(layer.get_frame() == nullptr);\r
+       ASSERT_TRUE(layer.render_frame() == nullptr);\r
        ASSERT_TRUE(layer.active() == nullptr);\r
 }
\ No newline at end of file