mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-04 05:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix asserts in file/gif_tests

Browse Source
This commit is contained in:
David Capello 2014-07-30 01:45:59 -03:00
parent 91b0c2d071
commit 21e9078fd7
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/file/file_tests.cpp
View File

@ -46,7 +46,7 @@ TEST(File, SeveralSizes)
std::sprintf(&fn[0], "test.ase"); std::sprintf(&fn[0], "test.ase");
{ {
base::UniquePtr<Document> doc(ctx.documents().add(w, h, doc::ColorMode_INDEXED, 256)); doc::Document* doc = ctx.documents().add(w, h, doc::ColorMode_INDEXED, 256);
doc->setFilename(&fn[0]); doc->setFilename(&fn[0]);
// Random pixels // Random pixels
@ -64,10 +64,12 @@ TEST(File, SeveralSizes)
} }
save_document(&ctx, doc); save_document(&ctx, doc);
doc->close();
delete doc;
} }
{ {
base::UniquePtr<Document> doc(load_document(&ctx, &fn[0])); Document* doc = load_document(&ctx, &fn[0]);
ASSERT_EQ(w, doc->sprite()->width()); ASSERT_EQ(w, doc->sprite()->width());
ASSERT_EQ(h, doc->sprite()->height()); ASSERT_EQ(h, doc->sprite()->height());
@ -84,6 +86,9 @@ TEST(File, SeveralSizes)
c = std::rand()%256; c = std::rand()%256;
} }
} }
doc->close();
delete doc;
} }
} }
} }

40
src/app/file/gif_tests.cpp
View File

@ -30,8 +30,6 @@
using namespace app; using namespace app;
typedef base::UniquePtr<Document> DocumentPtr;
class GifFormat : public ::testing::Test { class GifFormat : public ::testing::Test {
public: public:
GifFormat() : m_system(she::create_system()) { GifFormat() : m_system(she::create_system()) {
@ -60,6 +58,9 @@ TEST_F(GifFormat, Dimensions)
clear_image(image, doc->sprite()->transparentColor()); clear_image(image, doc->sprite()->transparentColor());
save_document(&m_ctx, doc); save_document(&m_ctx, doc);
doc->close();
delete doc;
} }
{ {
@ -72,6 +73,9 @@ TEST_F(GifFormat, Dimensions)
// TODO instead of 256, this should be 16 as Gif files contains // TODO instead of 256, this should be 16 as Gif files contains
// palettes that are power of two. // palettes that are power of two.
EXPECT_EQ(256, sprite->getPalette(FrameNumber(0))->size()); EXPECT_EQ(256, sprite->getPalette(FrameNumber(0))->size());
doc->close();
delete doc;
} }
} }
@ -101,6 +105,9 @@ TEST_F(GifFormat, OpaqueIndexed)
image->putPixel(1, 1, 3); image->putPixel(1, 1, 3);
save_document(&m_ctx, doc); save_document(&m_ctx, doc);
doc->close();
delete doc;
} }
{ {
@ -123,6 +130,9 @@ TEST_F(GifFormat, OpaqueIndexed)
EXPECT_EQ(1, image->getPixel(0, 1)); EXPECT_EQ(1, image->getPixel(0, 1));
EXPECT_EQ(2, image->getPixel(1, 0)); EXPECT_EQ(2, image->getPixel(1, 0));
EXPECT_EQ(3, image->getPixel(1, 1)); EXPECT_EQ(3, image->getPixel(1, 1));
doc->close();
delete doc;
} }
} }
@ -151,6 +161,9 @@ TEST_F(GifFormat, TransparentIndexed)
image->putPixel(1, 1, 3); image->putPixel(1, 1, 3);
save_document(&m_ctx, doc); save_document(&m_ctx, doc);
doc->close();
delete doc;
} }
{ {
@ -173,6 +186,9 @@ TEST_F(GifFormat, TransparentIndexed)
EXPECT_EQ(1, image->getPixel(0, 1)); EXPECT_EQ(1, image->getPixel(0, 1));
EXPECT_EQ(2, image->getPixel(1, 0)); EXPECT_EQ(2, image->getPixel(1, 0));
EXPECT_EQ(3, image->getPixel(1, 1)); EXPECT_EQ(3, image->getPixel(1, 1));
doc->close();
delete doc;
} }
} }
@ -195,6 +211,9 @@ TEST_F(GifFormat, TransparentRgbQuantization)
image->putPixel(1, 1, rgb(0, 0, 255)); image->putPixel(1, 1, rgb(0, 0, 255));
save_document(&m_ctx, doc); save_document(&m_ctx, doc);
doc->close();
delete doc;
} }
{ {
@ -211,6 +230,9 @@ TEST_F(GifFormat, TransparentRgbQuantization)
EXPECT_EQ(rgb(255, 0, 0), pal->getEntry(image->getPixel(0, 1))); EXPECT_EQ(rgb(255, 0, 0), pal->getEntry(image->getPixel(0, 1)));
EXPECT_EQ(rgb(0, 255, 0), pal->getEntry(image->getPixel(1, 0))); EXPECT_EQ(rgb(0, 255, 0), pal->getEntry(image->getPixel(1, 0)));
EXPECT_EQ(rgb(0, 0, 255), pal->getEntry(image->getPixel(1, 1))); EXPECT_EQ(rgb(0, 0, 255), pal->getEntry(image->getPixel(1, 1)));
doc->close();
delete doc;
} }
} }
@ -235,6 +257,9 @@ TEST_F(GifFormat, OpaqueRgbQuantization)
image->putPixel(1, 1, rgb(0, 0, 255)); image->putPixel(1, 1, rgb(0, 0, 255));
save_document(&m_ctx, doc); save_document(&m_ctx, doc);
doc->close();
delete doc;
} }
{ {
@ -253,6 +278,9 @@ TEST_F(GifFormat, OpaqueRgbQuantization)
EXPECT_EQ(rgb(255, 0, 0), pal->getEntry(image->getPixel(0, 1))); EXPECT_EQ(rgb(255, 0, 0), pal->getEntry(image->getPixel(0, 1)));
EXPECT_EQ(rgb(0, 255, 0), pal->getEntry(image->getPixel(1, 0))); EXPECT_EQ(rgb(0, 255, 0), pal->getEntry(image->getPixel(1, 0)));
EXPECT_EQ(rgb(0, 0, 255), pal->getEntry(image->getPixel(1, 1))); EXPECT_EQ(rgb(0, 0, 255), pal->getEntry(image->getPixel(1, 1)));
doc->close();
delete doc;
} }
} }
@ -288,10 +316,13 @@ TEST_F(GifFormat, OpaqueRgbQuantizationTwoLayers)
// Do not modify palettes // Do not modify palettes
doc->setFormatOptions(SharedPtr<FormatOptions>(new GifOptions(GifOptions::NoQuantize))); doc->setFormatOptions(SharedPtr<FormatOptions>(new GifOptions(GifOptions::NoQuantize)));
save_document(&m_ctx, doc); save_document(&m_ctx, doc);
doc->close();
delete doc;
} }
{ {
DocumentPtr doc(load_document(&m_ctx, fn)); Document* doc = load_document(&m_ctx, fn);
Sprite* sprite = doc->sprite(); Sprite* sprite = doc->sprite();
LayerImage* layer = dynamic_cast<LayerImage*>(sprite->folder()->getFirstLayer()); LayerImage* layer = dynamic_cast<LayerImage*>(sprite->folder()->getFirstLayer());
@ -309,5 +340,8 @@ TEST_F(GifFormat, OpaqueRgbQuantizationTwoLayers)
EXPECT_EQ(rgba(255, 255, 255, 255), pal->getEntry(0)); EXPECT_EQ(rgba(255, 255, 255, 255), pal->getEntry(0));
EXPECT_EQ(rgba(255, 0, 0, 255), pal->getEntry(1)); EXPECT_EQ(rgba(255, 0, 0, 255), pal->getEntry(1));
doc->close();
delete doc;
} }
} }