From 436088e97ae3ee8bcfd0530139579fc62271bbc5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 29 Jun 2015 01:20:53 +0300 Subject: Fix error and warnings in test compilation. --- src/gui/fonts/textchunklist_unittest.cc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/gui') diff --git a/src/gui/fonts/textchunklist_unittest.cc b/src/gui/fonts/textchunklist_unittest.cc index f245af664..e5994b5b6 100644 --- a/src/gui/fonts/textchunklist_unittest.cc +++ b/src/gui/fonts/textchunklist_unittest.cc @@ -466,10 +466,10 @@ TEST_CASE("TextChunkList sort 1", "TextChunkList") Color(1, 2, 3), Color(1, 2, 3)); TextChunkSmall item3("test line2", Color(1, 2, 3), Color(1, 2, 3)); - REQUIRE(false == item1 < item2); - REQUIRE(false == item2 < item1); - REQUIRE(true == item1 < item3); - REQUIRE(false == item3 < item1); + REQUIRE(false == (item1 < item2)); + REQUIRE(false == (item2 < item1)); + REQUIRE(item1 < item3); + REQUIRE(false == (item3 < item1)); } TEST_CASE("TextChunkList sort 2", "TextChunkList") @@ -478,8 +478,8 @@ TEST_CASE("TextChunkList sort 2", "TextChunkList") Color(1, 2, 3), Color(1, 2, 3)); TextChunkSmall item2("test line1", Color(2, 3, 4), Color(1, 2, 3)); - REQUIRE(true == item1 < item2); - REQUIRE(false == item2 < item1); + REQUIRE(item1 < item2); + REQUIRE(false == (item2 < item1)); } TEST_CASE("TextChunkList sort 3", "TextChunkList") @@ -488,8 +488,8 @@ TEST_CASE("TextChunkList sort 3", "TextChunkList") Color(1, 2, 3), Color(1, 2, 3)); TextChunkSmall item2("test line1", Color(1, 3, 4), Color(1, 2, 3)); - REQUIRE(true == item1 < item2); - REQUIRE(false == item2 < item1); + REQUIRE(item1 < item2); + REQUIRE(false == (item2 < item1)); } TEST_CASE("TextChunkList sort 4", "TextChunkList") @@ -498,8 +498,8 @@ TEST_CASE("TextChunkList sort 4", "TextChunkList") Color(1, 2, 3), Color(1, 2, 3)); TextChunkSmall item2("test line1", Color(1, 2, 4), Color(1, 2, 3)); - REQUIRE(true == item1 < item2); - REQUIRE(false == item2 < item1); + REQUIRE(item1 < item2); + REQUIRE(false == (item2 < item1)); } TEST_CASE("TextChunkList sort 5", "TextChunkList") @@ -508,8 +508,8 @@ TEST_CASE("TextChunkList sort 5", "TextChunkList") Color(1, 2, 3), Color(1, 2, 3)); TextChunkSmall item2("test line1", Color(1, 2, 3), Color(2, 2, 3)); - REQUIRE(true == item1 < item2); - REQUIRE(false == item2 < item1); + REQUIRE(item1 < item2); + REQUIRE(false == (item2 < item1)); } TEST_CASE("TextChunkList sort 6", "TextChunkList") @@ -518,8 +518,8 @@ TEST_CASE("TextChunkList sort 6", "TextChunkList") Color(1, 2, 3), Color(1, 2, 3)); TextChunkSmall item2("test line1", Color(1, 2, 3), Color(1, 3, 3)); - REQUIRE(true == item1 < item2); - REQUIRE(false == item2 < item1); + REQUIRE(item1 < item2); + REQUIRE(false == (item2 < item1)); } TEST_CASE("TextChunkList sort 7", "TextChunkList") @@ -528,6 +528,6 @@ TEST_CASE("TextChunkList sort 7", "TextChunkList") Color(1, 2, 3), Color(1, 2, 3)); TextChunkSmall item2("test line1", Color(1, 2, 3), Color(1, 2, 4)); - REQUIRE(true == item1 < item2); - REQUIRE(false == item2 < item1); + REQUIRE(item1 < item2); + REQUIRE(false == (item2 < item1)); } -- cgit v1.2.3-70-g09d2