summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui/sdlfont_unittest.cc90
1 files changed, 45 insertions, 45 deletions
diff --git a/src/gui/sdlfont_unittest.cc b/src/gui/sdlfont_unittest.cc
index b9d08037c..e0f536c01 100644
--- a/src/gui/sdlfont_unittest.cc
+++ b/src/gui/sdlfont_unittest.cc
@@ -43,7 +43,7 @@ TEST(TextChunkList, add1)
TextChunkList list;
SDLTextChunk *chunk = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(2, 3, 4));
+ Color(1, 2, 3), Color(2, 3, 4));
list.insertFirst(chunk);
@@ -66,9 +66,9 @@ TEST(TextChunkList, add2)
TextChunkList list;
SDLTextChunk *chunk1 = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(3, 4, 5));
+ Color(1, 2, 3), Color(3, 4, 5));
SDLTextChunk *chunk2 = new SDLTextChunk("test",
- gcn::Color(2, 3, 4), gcn::Color(4, 5, 6));
+ Color(2, 3, 4), Color(4, 5, 6));
list.insertFirst(chunk2);
list.insertFirst(chunk1);
@@ -96,7 +96,7 @@ TEST(TextChunkList, addRemoveBack1)
TextChunkList list;
SDLTextChunk *chunk = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
list.insertFirst(chunk);
list.removeBack();
@@ -113,9 +113,9 @@ TEST(TextChunkList, addRemoveBack2)
TextChunkList list;
SDLTextChunk *chunk1 = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
SDLTextChunk *chunk2 = new SDLTextChunk("test2",
- gcn::Color(1, 2, 4), gcn::Color(1, 2, 5));
+ Color(1, 2, 4), Color(1, 2, 5));
list.insertFirst(chunk2);
list.insertFirst(chunk1);
@@ -140,9 +140,9 @@ TEST(TextChunkList, addRemoveBack3)
TextChunkList list;
SDLTextChunk *chunk1 = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
SDLTextChunk *chunk2 = new SDLTextChunk("test2",
- gcn::Color(2, 3, 4), gcn::Color(2, 3, 4));
+ Color(2, 3, 4), Color(2, 3, 4));
list.insertFirst(chunk2);
list.insertFirst(chunk1);
@@ -161,11 +161,11 @@ TEST(TextChunkList, addRemoveBack4)
TextChunkList list;
SDLTextChunk *chunk1 = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
SDLTextChunk *chunk2 = new SDLTextChunk("test2",
- gcn::Color(2, 3, 4), gcn::Color(2, 3, 4));
+ Color(2, 3, 4), Color(2, 3, 4));
SDLTextChunk *chunk3 = new SDLTextChunk("test",
- gcn::Color(3, 4, 5), gcn::Color(3, 4, 5));
+ Color(3, 4, 5), Color(3, 4, 5));
list.insertFirst(chunk3);
list.insertFirst(chunk2);
@@ -191,7 +191,7 @@ TEST(TextChunkList, moveToFirst1)
TextChunkList list;
SDLTextChunk *chunk = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(2, 3, 4));
+ Color(1, 2, 3), Color(2, 3, 4));
list.insertFirst(chunk);
list.moveToFirst(chunk);
@@ -208,9 +208,9 @@ TEST(TextChunkList, moveToFirst2)
TextChunkList list;
SDLTextChunk *chunk1 = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
SDLTextChunk *chunk2 = new SDLTextChunk("test",
- gcn::Color(2, 3, 4), gcn::Color(1, 2, 3));
+ Color(2, 3, 4), Color(1, 2, 3));
list.insertFirst(chunk1);
list.insertFirst(chunk2);
@@ -230,11 +230,11 @@ TEST(TextChunkList, moveToFirst3)
TextChunkList list;
SDLTextChunk *chunk1 = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
SDLTextChunk *chunk2 = new SDLTextChunk("test",
- gcn::Color(1, 2, 4), gcn::Color(1, 2, 3));
+ Color(1, 2, 4), Color(1, 2, 3));
SDLTextChunk *chunk3 = new SDLTextChunk("test",
- gcn::Color(1, 2, 5), gcn::Color(1, 2, 3));
+ Color(1, 2, 5), Color(1, 2, 3));
list.insertFirst(chunk3);
list.insertFirst(chunk1);
@@ -257,11 +257,11 @@ TEST(TextChunkList, moveToFirst4)
TextChunkList list;
SDLTextChunk *chunk1 = new SDLTextChunk("test",
- gcn::Color(), gcn::Color());
+ Color(), Color());
SDLTextChunk *chunk2 = new SDLTextChunk("test2",
- gcn::Color(), gcn::Color());
+ Color(), Color());
SDLTextChunk *chunk3 = new SDLTextChunk("test3",
- gcn::Color(), gcn::Color());
+ Color(), Color());
list.insertFirst(chunk1);
list.insertFirst(chunk3);
@@ -284,7 +284,7 @@ TEST(TextChunkList, clear1)
TextChunkList list;
int chunksLeft = sdlTextChunkCnt;
- SDLTextChunk *chunk = new SDLTextChunk("test", gcn::Color(), gcn::Color());
+ SDLTextChunk *chunk = new SDLTextChunk("test", Color(), Color());
list.insertFirst(chunk);
list.clear();
@@ -303,11 +303,11 @@ TEST(TextChunkList, clear2)
int chunksLeft = sdlTextChunkCnt;
SDLTextChunk *chunk1 = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(2, 0, 0));
+ Color(1, 2, 3), Color(2, 0, 0));
SDLTextChunk *chunk2 = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(2, 0, 1));
+ Color(1, 2, 3), Color(2, 0, 1));
SDLTextChunk *chunk3 = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(2, 0, 2));
+ Color(1, 2, 3), Color(2, 0, 2));
list.insertFirst(chunk1);
list.insertFirst(chunk2);
@@ -328,11 +328,11 @@ TEST(TextChunkList, clear3)
int chunksLeft = sdlTextChunkCnt;
SDLTextChunk *chunk1 = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(2, 0, 0));
+ Color(1, 2, 3), Color(2, 0, 0));
SDLTextChunk *chunk2 = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(2, 0, 1));
+ Color(1, 2, 3), Color(2, 0, 1));
SDLTextChunk *chunk3 = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(2, 0, 2));
+ Color(1, 2, 3), Color(2, 0, 2));
list.insertFirst(chunk1);
list.insertFirst(chunk2);
@@ -359,11 +359,11 @@ TEST(TextChunkList, clear4)
int chunksLeft = sdlTextChunkCnt;
SDLTextChunk *chunk1 = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(2, 0, 0));
+ Color(1, 2, 3), Color(2, 0, 0));
SDLTextChunk *chunk2 = new SDLTextChunk("test",
- gcn::Color(1, 2, 3), gcn::Color(2, 0, 1));
+ Color(1, 2, 3), Color(2, 0, 1));
SDLTextChunk *chunk3 = new SDLTextChunk("test3",
- gcn::Color(1, 2, 3), gcn::Color(2, 0, 2));
+ Color(1, 2, 3), Color(2, 0, 2));
list.insertFirst(chunk1);
list.insertFirst(chunk2);
@@ -387,11 +387,11 @@ TEST(TextChunkList, clear4)
TEST(TextChunkList, sort1)
{
SDLTextChunkSmall item1("test line1",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
SDLTextChunkSmall item2("test line1",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
SDLTextChunkSmall item3("test line2",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
EXPECT_EQ(false, item1 < item2);
EXPECT_EQ(false, item2 < item1);
EXPECT_EQ(true, item1 < item3);
@@ -401,9 +401,9 @@ TEST(TextChunkList, sort1)
TEST(TextChunkList, sort2)
{
SDLTextChunkSmall item1("test line1",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
SDLTextChunkSmall item2("test line1",
- gcn::Color(2, 3, 4), gcn::Color(1, 2, 3));
+ Color(2, 3, 4), Color(1, 2, 3));
EXPECT_EQ(true, item1 < item2);
EXPECT_EQ(false, item2 < item1);
}
@@ -411,9 +411,9 @@ TEST(TextChunkList, sort2)
TEST(TextChunkList, sort3)
{
SDLTextChunkSmall item1("test line1",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
SDLTextChunkSmall item2("test line1",
- gcn::Color(1, 3, 4), gcn::Color(1, 2, 3));
+ Color(1, 3, 4), Color(1, 2, 3));
EXPECT_EQ(true, item1 < item2);
EXPECT_EQ(false, item2 < item1);
}
@@ -421,9 +421,9 @@ TEST(TextChunkList, sort3)
TEST(TextChunkList, sort4)
{
SDLTextChunkSmall item1("test line1",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
SDLTextChunkSmall item2("test line1",
- gcn::Color(1, 2, 4), gcn::Color(1, 2, 3));
+ Color(1, 2, 4), Color(1, 2, 3));
EXPECT_EQ(true, item1 < item2);
EXPECT_EQ(false, item2 < item1);
}
@@ -431,9 +431,9 @@ TEST(TextChunkList, sort4)
TEST(TextChunkList, sort5)
{
SDLTextChunkSmall item1("test line1",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
SDLTextChunkSmall item2("test line1",
- gcn::Color(1, 2, 3), gcn::Color(2, 2, 3));
+ Color(1, 2, 3), Color(2, 2, 3));
EXPECT_EQ(true, item1 < item2);
EXPECT_EQ(false, item2 < item1);
}
@@ -441,9 +441,9 @@ TEST(TextChunkList, sort5)
TEST(TextChunkList, sort6)
{
SDLTextChunkSmall item1("test line1",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
SDLTextChunkSmall item2("test line1",
- gcn::Color(1, 2, 3), gcn::Color(1, 3, 3));
+ Color(1, 2, 3), Color(1, 3, 3));
EXPECT_EQ(true, item1 < item2);
EXPECT_EQ(false, item2 < item1);
}
@@ -451,9 +451,9 @@ TEST(TextChunkList, sort6)
TEST(TextChunkList, sort7)
{
SDLTextChunkSmall item1("test line1",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 3));
+ Color(1, 2, 3), Color(1, 2, 3));
SDLTextChunkSmall item2("test line1",
- gcn::Color(1, 2, 3), gcn::Color(1, 2, 4));
+ Color(1, 2, 3), Color(1, 2, 4));
EXPECT_EQ(true, item1 < item2);
EXPECT_EQ(false, item2 < item1);
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 12:42:59 +0000