diff options
author | Karl Berry <karl@freefriends.org> | 2018-01-17 22:50:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-01-17 22:50:15 +0000 |
commit | e7dfe5ab98e759081fc73990ed6c1ac6910a105d (patch) | |
tree | 1635f79c86856a6aa57a45b8b952b651ef9fcba9 /Build/source/texk/dvisvgm/dvisvgm-src/tests/GFReaderTest.cpp | |
parent | ae542350b1e3add10d4ee3d7b68f610132f31a50 (diff) |
dvisvgm 2.3.1 (patched)
git-svn-id: svn://tug.org/texlive/trunk@46352 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-src/tests/GFReaderTest.cpp')
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-src/tests/GFReaderTest.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/tests/GFReaderTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/tests/GFReaderTest.cpp index bfba5514c4f..fe757de11ae 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/tests/GFReaderTest.cpp +++ b/Build/source/texk/dvisvgm/dvisvgm-src/tests/GFReaderTest.cpp @@ -2,7 +2,7 @@ ** GFReaderTest.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2017 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2018 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** @@ -32,18 +32,17 @@ using namespace std; -struct PixelActions : public Bitmap::Callback -{ +struct PixelActions : public Bitmap::Callback { void pixel (int x, int y, bool set, const Bitmap &bm) { if (charmap.size() == 0) { charmap.resize(bm.height()); for (int i=0; i < bm.height(); i++) charmap[i] = string(bm.width(), ' '); } - ASSERT_GE(x, 0); - ASSERT_LT(x, bm.width()); - ASSERT_GE(y, 0); - ASSERT_LT(y, bm.height()); + EXPECT_GE(x, 0); + EXPECT_LT(x, bm.width()); + EXPECT_GE(y, 0); + EXPECT_LT(y, bm.height()); charmap[y][x] = (set ? '*' : '-'); } @@ -261,26 +260,27 @@ TEST(GFReaderTest, executeChar) { ASSERT_TRUE(bool(ifs)); GFReader gfReader(ifs); PixelActions actions; - - gfReader.executeChar('a'); - ASSERT_EQ(gfReader.getBitmap().width(), 39); - ASSERT_EQ(gfReader.getBitmap().height(), 39); - gfReader.getBitmap().forAllPixels(actions); - check_letter(letter_a, actions.charmap); - - actions.charmap.clear(); - gfReader.executeChar('g'); - ASSERT_EQ(gfReader.getBitmap().width(), 39); - ASSERT_EQ(gfReader.getBitmap().height(), 56); - gfReader.getBitmap().forAllPixels(actions); - check_letter(letter_g, actions.charmap); - - actions.charmap.clear(); - gfReader.executeChar('M'); - ASSERT_EQ(gfReader.getBitmap().width(), 70); - ASSERT_EQ(gfReader.getBitmap().height(), 57); - gfReader.getBitmap().forAllPixels(actions); - check_letter(letter_M, actions.charmap); + { gfReader.executeChar('a'); + ASSERT_EQ(gfReader.getBitmap().width(), 39); + ASSERT_EQ(gfReader.getBitmap().height(), 39); + SCOPED_TRACE("A"); + gfReader.getBitmap().forAllPixels(actions); + check_letter(letter_a, actions.charmap); + }{ actions.charmap.clear(); + gfReader.executeChar('g'); + ASSERT_EQ(gfReader.getBitmap().width(), 39); + ASSERT_EQ(gfReader.getBitmap().height(), 56); + SCOPED_TRACE("B"); + gfReader.getBitmap().forAllPixels(actions); + check_letter(letter_g, actions.charmap); + }{ actions.charmap.clear(); + gfReader.executeChar('M'); + ASSERT_EQ(gfReader.getBitmap().width(), 70); + ASSERT_EQ(gfReader.getBitmap().height(), 57); + SCOPED_TRACE("C"); + gfReader.getBitmap().forAllPixels(actions); + check_letter(letter_M, actions.charmap); + } } |