From 2636e834c25a42bb2dd01c3c61d075b666dee3bf Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Sun, 25 Dec 2011 16:18:49 +0100 Subject: base: moved Image and Texture to more appropriate locations --- test/base/image.cpp | 109 --------------------------------------------------- test/utils/image.cpp | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 109 deletions(-) delete mode 100644 test/base/image.cpp create mode 100644 test/utils/image.cpp (limited to 'test') diff --git a/test/base/image.cpp b/test/base/image.cpp deleted file mode 100644 index d91d553c..00000000 --- a/test/base/image.cpp +++ /dev/null @@ -1,109 +0,0 @@ -/* - * UltraStar Deluxe - Karaoke Game - * - * UltraStar Deluxe is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - */ - -#include "image.hpp" - -#include -#include -#include - -#include - -namespace usdx -{ - class ImageTest : public CppUnit::TestFixture { - CPPUNIT_TEST_SUITE(ImageTest); - CPPUNIT_TEST(testBmp); - CPPUNIT_TEST(testJpg); - CPPUNIT_TEST(testGif); - CPPUNIT_TEST(testPng); - CPPUNIT_TEST_EXCEPTION(testNotAnImage, usdx::ImageLoadException); - CPPUNIT_TEST_SUITE_END(); - private: - static log4cpp::Category& log; - public: - void setUp() - { - } - - void tearDown() - { - } - - void testBmp() - { - Image img("./testdata/test.bmp"); - const SDL_Surface *surface = img.get_surface(); - log << log4cpp::Priority::INFO << "test.bmp: " << - "w = " << surface->w << "; h = " << surface->h; - CPPUNIT_ASSERT(40 == surface->w); - CPPUNIT_ASSERT(30 == surface->h); - } - - void testJpg() - { - Image img("./testdata/test.jpg"); - const SDL_Surface *surface = img.get_surface(); - log << log4cpp::Priority::INFO << "test.jpg: " << - "w = " << surface->w << "; h = " << surface->h; - CPPUNIT_ASSERT(40 == surface->w); - CPPUNIT_ASSERT(30 == surface->h); - } - - void testPng() - { - Image img("./testdata/test.png"); - const SDL_Surface *surface = img.get_surface(); - log << log4cpp::Priority::INFO << "test.png: " << - "w = " << surface->w << "; h = " << surface->h; - CPPUNIT_ASSERT(40 == surface->w); - CPPUNIT_ASSERT(30 == surface->h); - } - - void testGif() - { - Image img("./testdata/test.gif"); - const SDL_Surface *surface = img.get_surface(); - log << log4cpp::Priority::INFO << "test.gif: " << - "w = " << surface->w << "; h = " << surface->h; - CPPUNIT_ASSERT(40 == surface->w); - CPPUNIT_ASSERT(30 == surface->h); - } - - void testNotAnImage() - { - Image img("./testdata/testsong_correct.txt"); - const SDL_Surface *surface = img.get_surface(); - log << log4cpp::Priority::INFO << "testsong_correct.txt: " << - "w = " << surface->w << "; h = " << surface->h; - } - }; - - log4cpp::Category& ImageTest::log = - log4cpp::Category::getInstance("test.usdx.base.image"); - - CPPUNIT_TEST_SUITE_REGISTRATION(ImageTest); -}; diff --git a/test/utils/image.cpp b/test/utils/image.cpp new file mode 100644 index 00000000..d91d553c --- /dev/null +++ b/test/utils/image.cpp @@ -0,0 +1,109 @@ +/* + * UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + */ + +#include "image.hpp" + +#include +#include +#include + +#include + +namespace usdx +{ + class ImageTest : public CppUnit::TestFixture { + CPPUNIT_TEST_SUITE(ImageTest); + CPPUNIT_TEST(testBmp); + CPPUNIT_TEST(testJpg); + CPPUNIT_TEST(testGif); + CPPUNIT_TEST(testPng); + CPPUNIT_TEST_EXCEPTION(testNotAnImage, usdx::ImageLoadException); + CPPUNIT_TEST_SUITE_END(); + private: + static log4cpp::Category& log; + public: + void setUp() + { + } + + void tearDown() + { + } + + void testBmp() + { + Image img("./testdata/test.bmp"); + const SDL_Surface *surface = img.get_surface(); + log << log4cpp::Priority::INFO << "test.bmp: " << + "w = " << surface->w << "; h = " << surface->h; + CPPUNIT_ASSERT(40 == surface->w); + CPPUNIT_ASSERT(30 == surface->h); + } + + void testJpg() + { + Image img("./testdata/test.jpg"); + const SDL_Surface *surface = img.get_surface(); + log << log4cpp::Priority::INFO << "test.jpg: " << + "w = " << surface->w << "; h = " << surface->h; + CPPUNIT_ASSERT(40 == surface->w); + CPPUNIT_ASSERT(30 == surface->h); + } + + void testPng() + { + Image img("./testdata/test.png"); + const SDL_Surface *surface = img.get_surface(); + log << log4cpp::Priority::INFO << "test.png: " << + "w = " << surface->w << "; h = " << surface->h; + CPPUNIT_ASSERT(40 == surface->w); + CPPUNIT_ASSERT(30 == surface->h); + } + + void testGif() + { + Image img("./testdata/test.gif"); + const SDL_Surface *surface = img.get_surface(); + log << log4cpp::Priority::INFO << "test.gif: " << + "w = " << surface->w << "; h = " << surface->h; + CPPUNIT_ASSERT(40 == surface->w); + CPPUNIT_ASSERT(30 == surface->h); + } + + void testNotAnImage() + { + Image img("./testdata/testsong_correct.txt"); + const SDL_Surface *surface = img.get_surface(); + log << log4cpp::Priority::INFO << "testsong_correct.txt: " << + "w = " << surface->w << "; h = " << surface->h; + } + }; + + log4cpp::Category& ImageTest::log = + log4cpp::Category::getInstance("test.usdx.base.image"); + + CPPUNIT_TEST_SUITE_REGISTRATION(ImageTest); +}; -- cgit v1.2.3