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/ToUnicodeMapTest.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/ToUnicodeMapTest.cpp')
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-src/tests/ToUnicodeMapTest.cpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/tests/ToUnicodeMapTest.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/tests/ToUnicodeMapTest.cpp index 29ffc6f2684..d5c61d8f3ed 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/tests/ToUnicodeMapTest.cpp +++ b/Build/source/texk/dvisvgm/dvisvgm-src/tests/ToUnicodeMapTest.cpp @@ -2,7 +2,7 @@ ** ToUnicodeMapTest.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 ** @@ -25,35 +25,37 @@ using namespace std; -#define CHECK_RANGE(ucmap, min, max, minval) check_range(ucmap, min, max, minval, __LINE__) +#define CHECK_RANGE(name, ucmap, min, max, minval) \ + {SCOPED_TRACE(name); check_range(ucmap, min, max, minval);} -static void check_range (const ToUnicodeMap &ucmap, uint32_t min, uint32_t max, uint32_t minval, int line) { + +static void check_range (const ToUnicodeMap &ucmap, uint32_t min, uint32_t max, uint32_t minval) { for (uint32_t i=min; i <= max; i++) - ASSERT_EQ(ucmap.valueAt(i), minval+(i-min)) << __FILE__ << ":" << line << ": i=" << i; + ASSERT_EQ(ucmap.valueAt(i), minval+(i-min)) << "i=" << i; } TEST(ToUnicodeMapTest, addMissingMappings1) { ToUnicodeMap ucmap; ASSERT_TRUE(ucmap.addMissingMappings(20)); - ASSERT_EQ(ucmap.size(), 1); - CHECK_RANGE(ucmap, 1, 20, 1); + ASSERT_EQ(ucmap.size(), 1u); + CHECK_RANGE("A", ucmap, 1, 20, 1); } TEST(ToUnicodeMapTest, addMissingMappings2) { ToUnicodeMap ucmap; ucmap.addRange(5, 8, 40); - ASSERT_EQ(ucmap.size(), 1); - CHECK_RANGE(ucmap, 5, 8, 40); + ASSERT_EQ(ucmap.size(), 1u); + CHECK_RANGE("A", ucmap, 5, 8, 40); ucmap.addRange(10, 15, 50); - ASSERT_EQ(ucmap.size(), 2); - CHECK_RANGE(ucmap, 5, 8, 40); - CHECK_RANGE(ucmap, 10, 15, 50); + ASSERT_EQ(ucmap.size(), 2u); + CHECK_RANGE("B", ucmap, 5, 8, 40); + CHECK_RANGE("C", ucmap, 10, 15, 50); ASSERT_TRUE(ucmap.addMissingMappings(20)); - ASSERT_EQ(ucmap.size(), 2); - CHECK_RANGE(ucmap, 1, 9, 36); - CHECK_RANGE(ucmap, 10, 20, 50); + ASSERT_EQ(ucmap.size(), 2u); + CHECK_RANGE("D", ucmap, 1, 9, 36); + CHECK_RANGE("E", ucmap, 10, 20, 50); } |