Browse Source

Text: rename test cases to match the actual API being tested.

The function isn't strictly limited to just lines, can work with whole
blocks too.
pull/168/head
Vladimír Vondruš 3 years ago
parent
commit
00305a7c53
  1. 42
      src/Magnum/Text/Test/RendererTest.cpp

42
src/Magnum/Text/Test/RendererTest.cpp

@ -52,14 +52,14 @@ struct RendererTest: TestSuite::Tester {
void lineGlyphPositionsInvalidDirection(); void lineGlyphPositionsInvalidDirection();
void lineGlyphPositionsNoFontOpened(); void lineGlyphPositionsNoFontOpened();
void lineGlyphQuads(); void glyphQuads();
void lineGlyphQuadsAliasedViews(); void glyphQuadsAliasedViews();
void lineGlyphQuadsInvalidViewSizes(); void glyphQuadsInvalidViewSizes();
void lineGlyphQuadsNoFontOpened(); void glyphQuadsNoFontOpened();
void lineGlyphQuadsFontNotFoundInCache(); void glyphQuadsFontNotFoundInCache();
void lineGlyphQuads2D(); void glyphQuads2D();
void lineGlyphQuads2DArrayGlyphCache(); void glyphQuads2DArrayGlyphCache();
void alignLine(); void alignLine();
void alignLineInvalidDirection(); void alignLineInvalidDirection();
@ -254,14 +254,14 @@ RendererTest::RendererTest() {
&RendererTest::lineGlyphPositionsInvalidDirection, &RendererTest::lineGlyphPositionsInvalidDirection,
&RendererTest::lineGlyphPositionsNoFontOpened, &RendererTest::lineGlyphPositionsNoFontOpened,
&RendererTest::lineGlyphQuads, &RendererTest::glyphQuads,
&RendererTest::lineGlyphQuadsAliasedViews, &RendererTest::glyphQuadsAliasedViews,
&RendererTest::lineGlyphQuadsInvalidViewSizes, &RendererTest::glyphQuadsInvalidViewSizes,
&RendererTest::lineGlyphQuadsNoFontOpened, &RendererTest::glyphQuadsNoFontOpened,
&RendererTest::lineGlyphQuadsFontNotFoundInCache, &RendererTest::glyphQuadsFontNotFoundInCache,
&RendererTest::lineGlyphQuads2D, &RendererTest::glyphQuads2D,
&RendererTest::lineGlyphQuads2DArrayGlyphCache}); &RendererTest::glyphQuads2DArrayGlyphCache});
addInstancedTests({&RendererTest::alignLine}, addInstancedTests({&RendererTest::alignLine},
Containers::arraySize(AlignLineData)); Containers::arraySize(AlignLineData));
@ -480,7 +480,7 @@ void RendererTest::lineGlyphPositionsNoFontOpened() {
CORRADE_COMPARE(out.str(), "Text::renderLineGlyphPositionsInto(): no font opened\n"); CORRADE_COMPARE(out.str(), "Text::renderLineGlyphPositionsInto(): no font opened\n");
} }
void RendererTest::lineGlyphQuads() { void RendererTest::glyphQuads() {
TestFont font; TestFont font;
font.openFile({}, 2.5f); font.openFile({}, 2.5f);
DummyGlyphCache cache = testGlyphCacheArray(font); DummyGlyphCache cache = testGlyphCacheArray(font);
@ -547,7 +547,7 @@ void RendererTest::lineGlyphQuads() {
}), TestSuite::Compare::Container); }), TestSuite::Compare::Container);
} }
void RendererTest::lineGlyphQuadsAliasedViews() { void RendererTest::glyphQuadsAliasedViews() {
/* Like lineGlyphPositions(), but with the input data stored in the output /* Like lineGlyphPositions(), but with the input data stored in the output
array. The internals should be written in a way that doesn't overwrite array. The internals should be written in a way that doesn't overwrite
the input before it's read. */ the input before it's read. */
@ -609,7 +609,7 @@ void RendererTest::lineGlyphQuadsAliasedViews() {
}), TestSuite::Compare::Container); }), TestSuite::Compare::Container);
} }
void RendererTest::lineGlyphQuadsInvalidViewSizes() { void RendererTest::glyphQuadsInvalidViewSizes() {
CORRADE_SKIP_IF_NO_ASSERT(); CORRADE_SKIP_IF_NO_ASSERT();
TestFont font; TestFont font;
@ -637,7 +637,7 @@ void RendererTest::lineGlyphQuadsInvalidViewSizes() {
TestSuite::Compare::String); TestSuite::Compare::String);
} }
void RendererTest::lineGlyphQuadsNoFontOpened() { void RendererTest::glyphQuadsNoFontOpened() {
CORRADE_SKIP_IF_NO_ASSERT(); CORRADE_SKIP_IF_NO_ASSERT();
TestFont font; TestFont font;
@ -649,7 +649,7 @@ void RendererTest::lineGlyphQuadsNoFontOpened() {
CORRADE_COMPARE(out.str(), "Text::renderGlyphQuadsInto(): no font opened\n"); CORRADE_COMPARE(out.str(), "Text::renderGlyphQuadsInto(): no font opened\n");
} }
void RendererTest::lineGlyphQuadsFontNotFoundInCache() { void RendererTest::glyphQuadsFontNotFoundInCache() {
CORRADE_SKIP_IF_NO_ASSERT(); CORRADE_SKIP_IF_NO_ASSERT();
TestFont font; TestFont font;
@ -664,7 +664,7 @@ void RendererTest::lineGlyphQuadsFontNotFoundInCache() {
CORRADE_COMPARE(out.str(), "Text::renderGlyphQuadsInto(): font not found among 2 fonts in passed glyph cache\n"); CORRADE_COMPARE(out.str(), "Text::renderGlyphQuadsInto(): font not found among 2 fonts in passed glyph cache\n");
} }
void RendererTest::lineGlyphQuads2D() { void RendererTest::glyphQuads2D() {
/* Like lineGlyphPositions(), but with just a 2D glyph cache and using the /* Like lineGlyphPositions(), but with just a 2D glyph cache and using the
three-component overload. */ three-component overload. */
@ -721,7 +721,7 @@ void RendererTest::lineGlyphQuads2D() {
}), TestSuite::Compare::Container); }), TestSuite::Compare::Container);
} }
void RendererTest::lineGlyphQuads2DArrayGlyphCache() { void RendererTest::glyphQuads2DArrayGlyphCache() {
CORRADE_SKIP_IF_NO_ASSERT(); CORRADE_SKIP_IF_NO_ASSERT();
TestFont font; TestFont font;

Loading…
Cancel
Save