Added unit tests for v2 and cleaned up code

README.md

@@ -11,13 +11,10 @@ The library is a simple wrapper on top of DirectShow and replaces a lot of boile
 ## Example
 
 ```c++
-#include "../WPL/WPL.h"
+
 #include "SDL2/SDL.h"
 #include "SDL2/SDL_syswm.h"
-
-#pragma comment(lib, "SDL2/SDL2main.lib")
-#pragma comment(lib, "SDL2/SDL2.lib")
-#pragma comment(lib, "WPL.lib")
+#include "../WPL/WPL.h"
 
 using namespace std;
 using namespace wpl;

WPL.Sample/WPL.Sample.vcxproj

@@ -95,6 +95,15 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <PreBuildEvent>
+      <Command>xcopy /Y "$(SolutionDir)WPL.Sample\demo.wmv" "$(OutDir)"</Command>
+    </PreBuildEvent>
+    <PreLinkEvent>
+      <Command>xcopy /Y "$(SolutionDir)WPL.Sample\demo.wmv" "$(OutDir)"</Command>
+    </PreLinkEvent>
+    <PostBuildEvent>
+      <Command>xcopy /Y "$(SolutionDir)WPL.Sample\demo.wmv" "$(OutDir)"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>

WPL.Sample/main.cpp

@@ -23,7 +23,7 @@ int main(int argc, char * argv[])
 	SDL_GetWindowWMInfo(window, &wmInfo);
 
 	VideoPlayer videoPlayer(wmInfo.info.win.window);
-	videoPlayer.openVideo(L"demo.wmv");
+	videoPlayer.openVideo("demo.wmv");
 	videoPlayer.play();
 
 	while(!exit) {
@@ -40,16 +40,22 @@ int main(int argc, char * argv[])
 					case SDLK_LEFT: videoPlayer.pause(); break;
 					case SDLK_DOWN: videoPlayer.stop(); break;
 
-					default: break;
+					default:
+						break;
 				}
 			}
 		}
 
 		videoPlayer.updateVideoWindow();
 		videoPlayer.repaint();
+
+		if(videoPlayer.hasFinished())
+		{
+			SDL_ShowSimpleMessageBox(NULL, "Done", "Video has finished", window);
+		}
 	}
 
 	SDL_DestroyWindow(window);
 	SDL_Quit();
-	return 0;
+	return 0 ;
 }

WPL.Tests/ErrorTests.cpp

@@ -1,5 +1,6 @@
 
 #include "CppUnitTest.h"
+#include "Tests.h"
 
 using namespace Microsoft::VisualStudio::CppUnitTestFramework;
 
@@ -10,7 +11,12 @@ namespace WPLTests
 	public:
 		TEST_METHOD(TestCannotFindFile)
 		{
-
+			wpl::VideoPlayer videoPlayer;
+
+			if(videoPlayer.openVideo("doesntexists.wmv"))
+			{
+				Assert::Fail(L"Error this file doesnt exist and should return false to indicate failure");
+			}
 		}
 	};
 }

WPL.Tests/StateTests.cpp

@@ -0,0 +1,110 @@
+
+#include "CppUnitTest.h"
+#include "Tests.h"
+
+using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+
+auto timeout = [](Uint32 interval, void * ptr) -> Uint32 {
+	SDL_Event e;
+	e.type = SDL_QUIT;
+	SDL_PushEvent(&e);
+	return 0;
+};
+
+namespace WPLTests
+{
+	TEST_CLASS(StateTests)
+	{
+	public:
+		TEST_METHOD(PlayTest)
+		{
+			SDL_Init(SDL_INIT_VIDEO);
+			SDL_Window * window = SDL_CreateWindow("Playback Demo", 100, 100, 800, 500, SDL_WINDOW_SHOWN);
+
+			SDL_SysWMinfo wmInfo;
+			SDL_VERSION(&wmInfo.version);
+			SDL_GetWindowWMInfo(window, &wmInfo);
+
+			wpl::VideoPlayer videoPlayer(wmInfo.info.win.window);
+
+			Assert::IsTrue(videoPlayer.openVideo("demo.wmv"), L"Error didnt load file");
+			Assert::IsTrue(videoPlayer.play(), L"Error couldnt play file");
+
+			SDL_DestroyWindow(window);
+			SDL_Quit();
+		}
+
+		TEST_METHOD(PauseTest)
+		{
+			SDL_Init(SDL_INIT_VIDEO);
+			SDL_Window * window = SDL_CreateWindow("", 100, 100, 800, 500, SDL_WINDOW_SHOWN);
+
+			SDL_SysWMinfo wmInfo;
+			SDL_VERSION(&wmInfo.version);
+			SDL_GetWindowWMInfo(window, &wmInfo);
+
+			wpl::VideoPlayer videoPlayer(wmInfo.info.win.window);
+
+			Assert::IsTrue(videoPlayer.openVideo("demo.wmv"), L"Error didnt load file");
+			Assert::IsTrue(videoPlayer.play(), L"Error couldnt play file");
+			Assert::IsTrue(videoPlayer.pause(), L"Error couldnt pause file");
+
+			SDL_DestroyWindow(window);
+			SDL_Quit();
+		}
+
+		TEST_METHOD(Stoptest)
+		{
+			SDL_Init(SDL_INIT_VIDEO);
+			SDL_Window * window = SDL_CreateWindow("", 100, 100, 800, 500, SDL_WINDOW_SHOWN);
+
+			SDL_SysWMinfo wmInfo;
+			SDL_VERSION(&wmInfo.version);
+			SDL_GetWindowWMInfo(window, &wmInfo);
+
+			wpl::VideoPlayer videoPlayer(wmInfo.info.win.window);
+
+			Assert::IsTrue(videoPlayer.openVideo("demo.wmv"), L"Error didnt load file");
+			Assert::IsTrue(videoPlayer.play(), L"Error couldnt play file");
+			Assert::IsTrue(videoPlayer.stop(), L"Error couldnt stop file");
+
+			SDL_DestroyWindow(window);
+			SDL_Quit();
+		}
+
+		TEST_METHOD(FinishedTest)
+		{
+			SDL_Init(SDL_INIT_VIDEO);
+			SDL_Window * window = SDL_CreateWindow("", 100, 100, 800, 500, SDL_WINDOW_SHOWN);
+
+			SDL_SysWMinfo wmInfo;
+			SDL_VERSION(&wmInfo.version);
+			SDL_GetWindowWMInfo(window, &wmInfo);
+
+			wpl::VideoPlayer videoPlayer(wmInfo.info.win.window);
+
+			Assert::IsTrue(videoPlayer.openVideo("demo.wmv"), L"Error didnt load file");
+			Assert::IsTrue(videoPlayer.play(), L"Error couldnt play file");
+
+			SDL_AddTimer(PLAYBACK_TIMEOUT, timeout, nullptr);
+
+			auto quit = false;
+
+			while (!quit) {
+				SDL_Event event;
+				while (SDL_PollEvent(&event)) {
+					if (event.type == SDL_QUIT) {
+						Assert::Fail();
+						quit = true;
+					}
+				}
+
+				if (videoPlayer.hasFinished())
+					quit = true;
+			}
+
+			SDL_DestroyWindow(window);
+			SDL_Quit();
+		}
+	};
+}

WPL.Tests/Tests.h

@@ -0,0 +1,25 @@
+
+#pragma once
+
+#include <windows.h>//different header file in linux
+#include <future>
+
+#include "../WPL/WPL.h"
+#include "../WPL.Sample/SDL2/SDL.h"
+#include "../WPL.Sample/SDL2/SDL_syswm.h"
+
+#pragma comment(lib, "../WPL.Sample/SDL2/SDL2main.lib")
+#pragma comment(lib, "../WPL.Sample/SDL2/SDL2.lib")
+#pragma comment(lib, "WPL.lib")
+
+#define PLAYBACK_TIMEOUT 15000
+
+template <typename... ParamTypes>
+void setTimeout(int milliseconds, std::function<void()> func)
+{
+	std::async(std::launch::async, [=]()
+	{
+		Sleep(milliseconds);
+		func();
+	});
+};

WPL.Tests/WPL.Tests.vcxproj

@@ -75,6 +75,8 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(OutDir);$(IncludePath)</IncludePath>
+    <LibraryPath>$(OutDir);$(IncludePath);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
@@ -158,6 +160,9 @@
     <ClCompile Include="ErrorTests.cpp" />
     <ClCompile Include="StateTests.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Tests.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

WPL.Tests/WPL.Tests.vcxproj.filters

@@ -22,4 +22,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Tests.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>