Clean Up

TrooperEngineTest/VideoEngineTest/ImageFileTest.cpp

@@ -0,0 +1,31 @@
+#include "ImageFileTest.hpp"
+
+#include "../UTest/UTest.hpp"
+
+/*** TrooperEngine DLL Header Files ***/
+#include "TrooperEngine.hpp"
+
+using VideoEngine::cImageFile;
+
+using VideoEngine::cSprite;
+
+void ImageFileTest()
+{
+	// cImageFile
+	printf("\nTesting cImageFile -----\n\n");
+
+	UTest u("cImageFile");
+
+	cImageFile* image = new cImageFile("ImageTest.bmp");
+
+	//u.test()
+
+	//image->SaveImage("ImageTestSaved.bmp");
+
+	//cSprite* sprite = new cSprite(&image);
+
+	//sprite->Draw();
+
+
+	u.report();
+}

TrooperEngineTest/VideoEngineTest/ImageFileTest.hpp

@@ -0,0 +1,6 @@
+#ifndef __IMAGEFILETEST__
+#define __IMAGEFILETEST__
+
+void ImageFileTest();
+
+#endif // __IMAGEFILETEST__

TrooperEngineTest/VideoEngineTest/ImageTest.cpp

@@ -1,29 +0,0 @@
-#include "ImageTest.hpp"
-
-#include "../UTest/UTest.hpp"
-
-/*** TrooperEngine DLL Header Files ***/
-#include "TrooperEngine.hpp"
-
-using VideoEngine::cImage;
-
-using VideoEngine::cSprite;
-
-void ImageTest()
-{
-	// cRenderer
-	printf("\nTesting cImage -----\n\n");
-
-	UTest u("cImage");
-
-	cImage* image = new cImage("ImageTest.bmp", "", false, 0, 0, 255, 255, true);
-
-	image->SaveImage("ImageTestSaved.bmp");
-
-	cSprite* sprite = new cSprite(&image);
-
-	sprite->Draw();
-
-
-	u.report();
-}

TrooperEngineTest/VideoEngineTest/ImageTest.hpp

@@ -1,6 +0,0 @@
-#ifndef __IMAGETEST__
-#define __IMAGETEST__
-
-void ImageTest();
-
-#endif // __IMAGETEST__

TrooperEngineTest/VideoEngineTest/RendererTest.cpp

@@ -14,8 +14,50 @@ void RendererTest()
 
 	UTest u("cRenderer");
 
-	SDL_Surface* sur = nullptr;
-	//cRenderer::Inst()->TextureToSurface();
+	u.test("cRenderer. Setup()", cRenderer::Inst().Setup());
+
+	u.test("Are Surface Equal. AreEqual()", RendererAreaEqual());
+	u.test("Are Surface Equal Not Equal. AreEqual()", RendererAreaEqualNotEqual());
+
+	u.test("Texture To Surface. TextureToSurface()", RendererTextureToSurface());
+
+
+
+	//u.test("Screen Shot", RendererTextureToSurface());
+	
 
 	u.report();
+}
+
+const bool RendererAreaEqual()
+{
+	SDL_Surface* one = SDL_LoadBMP("ImageTest.bmp");
+	SDL_Surface* two = SDL_LoadBMP("ImageTest.bmp");
+
+	return cRenderer::Inst().AreEqual(*one, *two);
+}
+
+const bool RendererAreaEqualNotEqual()
+{
+	SDL_Surface* one = SDL_LoadBMP("ImageTest.bmp");
+	SDL_Surface* two = SDL_LoadBMP("ImageTest.bmp");
+
+	one = SDL_ConvertSurfaceFormat(one, SDL_PIXELFORMAT_RGBA32, 0);
+
+	bool rtn = false;
+	if (cRenderer::Inst().AreEqual(*one, *two) == false)
+		rtn = true;
+	return rtn;
+}
+
+const bool RendererTextureToSurface()
+{
+	SDL_Texture* text = IMG_LoadTexture(cRenderer::Inst().getRendererCopy(), "ImageTest.bmp");
+
+	SDL_Surface* one = SDL_LoadBMP("ImageTest.bmp");
+	one = SDL_ConvertSurfaceFormat(one, SDL_PIXELFORMAT_RGBA32, 0);
+
+	SDL_Surface* sur = cRenderer::Inst().TextureToSurface(text);
+
+	return cRenderer::Inst().AreEqual(*one, *sur);
 }

TrooperEngineTest/VideoEngineTest/RendererTest.hpp

@@ -3,4 +3,10 @@
 
 void RendererTest();
 
+const bool RendererAreaEqual();
+
+const bool RendererAreaEqualNotEqual();
+
+const bool RendererTextureToSurface();
+
 #endif // __RENDERERTEST__

TrooperEngineTest/VideoEngineTest/VideoEngineTest.cpp

@@ -0,0 +1,14 @@
+#include "VideoEngineTest.hpp"
+
+#include "VideoTest.hpp"
+#include "RendererTest.hpp"
+#include "ImageFileTest.hpp"
+
+void VideoEngineTest()
+{
+	VideoTest();
+
+	RendererTest();
+
+	ImageFileTest();
+}

TrooperEngineTest/VideoEngineTest/VideoEngineTest.hpp

@@ -0,0 +1,6 @@
+#ifndef __VIDEOENGINETEST__
+#define __VIDEOENGINETEST__
+
+void VideoEngineTest();
+
+#endif // __VIDEOENGINETEST__

TrooperEngineTest/VideoEngineTest/VideoTest.cpp

@@ -18,16 +18,26 @@ void VideoTest()
 	VideoEngine::cVideo& video = VideoEngine::cVideo::Inst();
 	video.Initialize();
 
-	u.test("Video Initialize", video.IsInit());
+	u.test("Video Initialize. IsInit()", video.IsInit());
 
-	u.test("Video Setup", video.Setup());
+	u.test("Video Setup. Setup()", video.Setup());
 
 	//	CaptionTest
-	cString cap_set = "Hello World";
+	u.test("setCaption() and getCaption()", CaptionTest());
+	
+	u.report();
+}
+
+const bool CaptionTest()
+{
+	bool rtn = false;
+
+	cString cap_set = "Caption Test";
 	cVideo::Inst().setCaption(cap_set);
 	cString cap_get = cVideo::Inst().getCaption();
-	u.test("setCaption() and getCaption()", (cap_get == cap_set));
 
+	if (cap_get == cap_set)
+		rtn = true;
 
-	u.report();
+	return rtn;
 }

TrooperEngineTest/VideoEngineTest/VideoTest.hpp

@@ -3,4 +3,6 @@
 
 void VideoTest();
 
+const bool CaptionTest();
+
 #endif // __VIDEOTEST__