mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-23 18:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve error reporting on DocumentRange tests

Browse Source
This commit is contained in:
David Capello 2016-08-20 12:54:36 -03:00
parent eb43fa93bd
commit b4d423051e
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/document_range_tests.cpp
View File

@ -39,10 +39,10 @@ typedef base::UniquePtr<app::Document> DocumentPtr;
EXPECT_TRUE(expect_layer(d, 3)); EXPECT_TRUE(expect_layer(d, 3));
#define EXPECT_FRAME_ORDER(a, b, c, d) \ #define EXPECT_FRAME_ORDER(a, b, c, d) \
EXPECT_TRUE(expect_frame(a, 0)); \ EXPECT_TRUE(expect_frame(a, 0) && \
EXPECT_TRUE(expect_frame(b, 1)); \ expect_frame(b, 1) && \
EXPECT_TRUE(expect_frame(c, 2)); \ expect_frame(c, 2) && \
EXPECT_TRUE(expect_frame(d, 3)); expect_frame(d, 3));
#define EXPECT_FRAME_COPY1(a, b, c, d, e) \ #define EXPECT_FRAME_COPY1(a, b, c, d, e) \
EXPECT_TRUE(expect_frame(a, 0)); \ EXPECT_TRUE(expect_frame(a, 0)); \
@ -77,8 +77,7 @@ typedef base::UniquePtr<app::Document> DocumentPtr;
class DocRangeOps : public ::testing::Test { class DocRangeOps : public ::testing::Test {
public: public:
DocRangeOps() { DocRangeOps() {
black = rgba(0, 0, 0, 0); expected_color = rgba(255, 255, 255, 255);
white = rgba(255, 255, 255, 255);
doc.reset(static_cast<app::Document*>(ctx.documents().add(4, 4))); doc.reset(static_cast<app::Document*>(ctx.documents().add(4, 4)));
sprite = doc->sprite(); sprite = doc->sprite();
@ -118,8 +117,8 @@ public:
layer->addCel(cel); layer->addCel(cel);
} }
clear_image(image.get(), black); clear_image(image.get(), i + j*100);
put_pixel(image.get(), i, j, white); put_pixel(image.get(), i, j, expected_color);
} }
} }
} }
@ -168,8 +167,6 @@ protected:
bool expect_cel(layer_t expected_layer, frame_t expected_frame, bool expect_cel(layer_t expected_layer, frame_t expected_frame,
layer_t layer, frame_t frame) { layer_t layer, frame_t frame) {
color_t expected_color = white;
LayerList layers = sprite->allLayers(); LayerList layers = sprite->allLayers();
Cel* cel = layers[layer]->cel(frame); Cel* cel = layers[layer]->cel(frame);
if (!cel) if (!cel)
@ -179,7 +176,9 @@ protected:
cel->image(), cel->image(),
expected_layer, expected_frame); expected_layer, expected_frame);
EXPECT_EQ(expected_color, color); EXPECT_EQ(expected_color, color)
<< " - expecting layer " << expected_layer << " in " << layer << " and it is " << int(color%100) << "\n"
<< " - expecting frame " << expected_frame << " in " << frame << " and it is " << int(color/100);
return (expected_color == color); return (expected_color == color);
} }
@ -199,8 +198,7 @@ protected:
LayerImage* layer2; LayerImage* layer2;
LayerImage* layer3; LayerImage* layer3;
LayerImage* layer4; LayerImage* layer4;
color_t black; color_t expected_color;
color_t white;
}; };
inline DocumentRange range(Layer* fromLayer, frame_t fromFrNum, Layer* toLayer, frame_t toFrNum, DocumentRange::Type type) { inline DocumentRange range(Layer* fromLayer, frame_t fromFrNum, Layer* toLayer, frame_t toFrNum, DocumentRange::Type type) {