From: ronag Date: Mon, 1 Nov 2010 21:54:47 +0000 (+0000) Subject: 2.0.0.2: X-Git-Tag: 2.0.1~963 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=8ff4a7bfe2c39f89af241a51229dd8be446ac013;p=casparcg 2.0.0.2: - Missing files. git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@194 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- diff --git a/test/core/renderer/display_device.cpp b/test/core/renderer/display_device.cpp new file mode 100644 index 000000000..ae984871e --- /dev/null +++ b/test/core/renderer/display_device.cpp @@ -0,0 +1,9 @@ +#include + +#include +#include +#include +#include + +using namespace caspar; +using namespace caspar::core; \ No newline at end of file diff --git a/test/core/renderer/layer_test.cpp b/test/core/renderer/layer_test.cpp new file mode 100644 index 000000000..e57d6ec90 --- /dev/null +++ b/test/core/renderer/layer_test.cpp @@ -0,0 +1,120 @@ +#include + +#include +#include +#include +#include + +using namespace caspar; +using namespace caspar::core; + +struct mock_frame_producer : public frame_producer +{ + gpu_frame_ptr get_frame() + { return std::make_shared(0, 0); } + std::shared_ptr get_following_producer() const + { return nullptr; } + void set_leading_producer(const std::shared_ptr&) + {} + const frame_format_desc& get_frame_format_desc() const + {return frame_format_desc();} + void initialize(const frame_factory_ptr& factory) + {} +}; + +TEST(layer_test, load_nullptr) +{ + core::renderer::layer layer; + + ASSERT_THROW(layer.load(nullptr), null_argument); +} + +TEST(layer_test, load) +{ + core::renderer::layer layer; + auto background = std::make_shared(); + + layer.load(background); + + auto frame = layer.get_frame(); + + ASSERT_TRUE(layer.active() == nullptr); + ASSERT_TRUE(layer.background() == background); + ASSERT_TRUE(frame == nullptr); +} + +TEST(layer_test, load_auto_play) +{ + core::renderer::layer layer; + auto active = std::make_shared(); + + layer.load(active, renderer::load_option::auto_play); + + auto frame = layer.get_frame(); + + ASSERT_TRUE(layer.active() == active); + ASSERT_TRUE(layer.background() == nullptr); + ASSERT_TRUE(frame != nullptr); +} + +TEST(layer_test, load_active) +{ + core::renderer::layer layer; + auto active = std::make_shared(); + auto background = std::make_shared(); + + layer.load(active, renderer::load_option::auto_play); + layer.load(background); + + auto frame = layer.get_frame(); + + ASSERT_TRUE(layer.active() == active); + ASSERT_TRUE(layer.background() == background); + ASSERT_TRUE(frame != nullptr); +} + +TEST(layer_test, load_preview) +{ + core::renderer::layer layer; + auto background = std::make_shared(); + + layer.load(background, renderer::load_option::preview); + + auto frame = layer.get_frame(); + + ASSERT_TRUE(layer.active() == nullptr); + ASSERT_TRUE(layer.background() == background); + ASSERT_TRUE(frame != nullptr); + ASSERT_TRUE(frame->audio_data().empty()); +} + +TEST(layer_test, load_preview_active) +{ + core::renderer::layer layer; + auto active = std::make_shared(); + auto background = std::make_shared(); + + layer.load(active, renderer::load_option::auto_play); + layer.load(background, renderer::load_option::preview); + + auto frame = layer.get_frame(); + + ASSERT_TRUE(layer.active() == nullptr); + ASSERT_TRUE(layer.background() == background); + ASSERT_TRUE(frame != nullptr); +} + +TEST(layer_test, load_play) +{ + core::renderer::layer layer; + auto active = std::make_shared(); + + layer.load(active); + layer.play(); + + auto frame = layer.get_frame(); + + ASSERT_TRUE(layer.active() == active); + ASSERT_TRUE(layer.background() == nullptr); + ASSERT_TRUE(frame != nullptr); +} diff --git a/test/core/renderer/render_device.cpp b/test/core/renderer/render_device.cpp new file mode 100644 index 000000000..ae984871e --- /dev/null +++ b/test/core/renderer/render_device.cpp @@ -0,0 +1,9 @@ +#include + +#include +#include +#include +#include + +using namespace caspar; +using namespace caspar::core; \ No newline at end of file diff --git a/test/main.cpp b/test/main.cpp new file mode 100644 index 000000000..9a03131e0 --- /dev/null +++ b/test/main.cpp @@ -0,0 +1,11 @@ +#include +#include +#include + +int main(int argc, char **argv) +{ + MoveWindow(GetConsoleWindow(), 0, 0, 800, 1000, true); + ::testing::InitGoogleTest(&argc, argv); + RUN_ALL_TESTS(); + getchar(); +} \ No newline at end of file diff --git a/test/test.vcxproj b/test/test.vcxproj new file mode 100644 index 000000000..9d5b822ab --- /dev/null +++ b/test/test.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + NotUsing + + + NotUsing + NotUsing + + + NotUsing + + + NotUsing + NotUsing + + + + + {02308602-7fe0-4253-b96e-22134919f56a} + + + {79388c20-6499-4bf6-b8b9-d8c33d7d4ddd} + + + + {8002D74D-4E89-4BD6-8CE8-0FE4DF14CA5D} + Win32Proj + test + + + + Application + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + debug\ + release\ + ..\..\..\dependencies\gtest-1.5.0\include;..\..\dependencies\gtest-1.5.0\include;..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\dependencies\boost_1_44_0\;..\..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.6\include\;..\..\..\dependencies\ffmpeg 0.6\include\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\include\;..\..\..\dependencies\SFML-1.6\include\;..\..\dependencies\tbb30_20100406oss\include\;..\..\..\dependencies\tbb30_20100406oss\include\;$(IncludePath) + ..\..\..\dependencies\gtest-1.5.0\include;..\..\dependencies\gtest-1.5.0\include;..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\dependencies\boost_1_44_0\;..\..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.6\include\;..\..\..\dependencies\ffmpeg 0.6\include\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\include\;..\..\..\dependencies\SFML-1.6\include\;..\..\dependencies\tbb30_20100406oss\include\;..\..\..\dependencies\tbb30_20100406oss\include\;$(IncludePath) + ..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\dependencies\boost_1_44_0\stage\lib\;..\..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.6\lib\;..\..\..\dependencies\ffmpeg 0.6\lib\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\lib\;..\..\..\dependencies\SFML-1.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;..\..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath) + ..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\dependencies\boost_1_44_0\stage\lib\;..\..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.6\lib\;..\..\..\dependencies\ffmpeg 0.6\lib\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\lib\;..\..\..\dependencies\SFML-1.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;..\..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath) + $(ProjectDir)debug\ + $(ProjectDir)release\ + $(SolutionName) + $(SolutionName) + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../ + + + Console + true + ..\..\dependencies\gtest-1.5.0\msvc\gtest-md\Debug;..\..\..\dependencies\gtest-1.5.0\msvc\gtest-md\Debug;%(AdditionalLibraryDirectories) + gtestd.lib;gtest_main-mdd.lib;BlueHancUtils_d.lib;sfml-audio-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;OpenGL32.lib;FreeImage.lib;GLee.lib;Winmm.lib;Ws2_32.lib;BlueVelvet3_d.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;swscale-0.lib;%(AdditionalDependencies) + LIBC.lib + + + + + TurnOffAllWarnings + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../ + true + + + Console + true + true + true + ..\..\dependencies\gtest-1.5.0\msvc\gtest-md\Release;..\..\..\dependencies\gtest-1.5.0\msvc\gtest-md\Release;%(AdditionalLibraryDirectories) + gtest.lib;gtest_main-md.lib;BlueHancUtils.lib;sfml-audio.lib;sfml-window.lib;sfml-graphics.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;Bluevelvet3.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;SWSCALE-0.lib;tbb.lib;Glee.lib;%(AdditionalDependencies) + LIBC.lib + + + + + + \ No newline at end of file diff --git a/test/test.vcxproj.filters b/test/test.vcxproj.filters new file mode 100644 index 000000000..b607fb2a2 --- /dev/null +++ b/test/test.vcxproj.filters @@ -0,0 +1,28 @@ + + + + + {d4a5c843-0e41-4d98-9056-b7f0de0d49a7} + + + {6b116fc0-5f04-4952-a54b-06b208d13b1d} + + + {f7f271e6-1741-4d8e-8903-73f6b6363ef4} + + + + + Source\core\renderer + + + Source + + + Source\core\renderer + + + Source\core\renderer + + + \ No newline at end of file