summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-12-10 13:23:51 +0100
committerAlexander Shalamov <alexander.shalamov@mapbox.com>2020-01-15 15:02:11 +0200
commit1342cb44b3f8bb0cd5c019174b62886b84d62cf8 (patch)
tree9858ad62bfbcf1761563de12284cf5573e543e9c /test
parent7d8d13ce04710d1eb5687c143ab466fcf8ee6c84 (diff)
downloadqtlocation-mapboxgl-1342cb44b3f8bb0cd5c019174b62886b84d62cf8.tar.gz
[core] Remove unused WritingMode from getIconQuads
Diffstat (limited to 'test')
-rw-r--r--test/text/quads.test.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/test/text/quads.test.cpp b/test/text/quads.test.cpp
index a07f89f21a..46019da3ce 100644
--- a/test/text/quads.test.cpp
+++ b/test/text/quads.test.cpp
@@ -22,7 +22,7 @@ TEST(getIconQuads, normal) {
GeometryCoordinates line;
- SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+ SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
ASSERT_EQ(quads.size(), 1);
const auto& quad = quads[0];
@@ -62,7 +62,7 @@ TEST(getIconQuads, style) {
EXPECT_FLOAT_EQ(-18.5f, shapedIcon.left());
SymbolLayoutProperties::Evaluated layout;
- SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+ SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
ASSERT_EQ(quads.size(), 1);
const auto& quad = quads[0];
@@ -81,7 +81,7 @@ TEST(getIconQuads, style) {
{
auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
shapedIcon.fitIconToText(shapedText, IconTextFitType::Width, {{0, 0, 0, 0}}, {{0, 0}}, 24.0f / 24.0f);
- SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+ SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
ASSERT_EQ(quads.size(), 1);
const auto& quad = quads[0];
@@ -100,7 +100,7 @@ TEST(getIconQuads, style) {
{
auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
shapedIcon.fitIconToText(shapedText, IconTextFitType::Width, {{0, 0, 0, 0}}, {{0, 0}}, 12.0f / 24.0f);
- SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+ SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
ASSERT_EQ(quads.size(), 1);
const auto& quad = quads[0];
@@ -119,7 +119,7 @@ TEST(getIconQuads, style) {
{
auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
shapedIcon.fitIconToText(shapedText, IconTextFitType::Width, {{5, 10, 5, 10}}, {{0, 0}}, 12.0f / 24.0f);
- SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+ SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
ASSERT_EQ(quads.size(), 1);
const auto& quad = quads[0];
@@ -138,7 +138,7 @@ TEST(getIconQuads, style) {
{
auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
shapedIcon.fitIconToText(shapedText, IconTextFitType::Height, {{0, 0, 0, 0}}, {{0, 0}}, 24.0f / 24.0f);
- SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+ SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
ASSERT_EQ(quads.size(), 1);
const auto& quad = quads[0];
@@ -158,7 +158,7 @@ TEST(getIconQuads, style) {
SymbolLayoutProperties::Evaluated layout;
auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
shapedIcon.fitIconToText(shapedText, IconTextFitType::Height, {{0, 0, 0, 0}}, {{0, 0}}, 12.0f / 24.0f);
- SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+ SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
ASSERT_EQ(quads.size(), 1);
const auto& quad = quads[0];
@@ -177,7 +177,7 @@ TEST(getIconQuads, style) {
{
auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
shapedIcon.fitIconToText(shapedText, IconTextFitType::Height, {{5, 10, 5, 20}}, {{0, 0}}, 12.0f / 24.0f);
- SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+ SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
ASSERT_EQ(quads.size(), 1);
const auto& quad = quads[0];
@@ -196,7 +196,7 @@ TEST(getIconQuads, style) {
{
auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{0, 0, 0, 0}}, {{0, 0}}, 24.0f / 24.0f);
- SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+ SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
ASSERT_EQ(quads.size(), 1);
const auto& quad = quads[0];
@@ -215,7 +215,7 @@ TEST(getIconQuads, style) {
{
auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{0, 0, 0, 0}}, {{0, 0}}, 12.0f / 24.0f);
- SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+ SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
ASSERT_EQ(quads.size(), 1);
const auto& quad = quads[0];
@@ -234,7 +234,7 @@ TEST(getIconQuads, style) {
{
auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{5, 10, 5, 10}}, {{0, 0}}, 12.0f / 24.0f);
- SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+ SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
ASSERT_EQ(quads.size(), 1);
const auto& quad = quads[0];
@@ -255,7 +255,7 @@ TEST(getIconQuads, style) {
layout.get<TextSize>() = 12.0f;
auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0);
shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{0, 5, 10, 15}}, {{0, 0}}, 12.0f / 24.0f);
- SymbolQuads quads = getIconQuads(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA);
+ SymbolQuads quads = getIconQuads(shapedIcon, SymbolContent::IconRGBA);
ASSERT_EQ(quads.size(), 1);
const auto& quad = quads[0];
View Lorry Controller Status