From 0a9a27012d7937d2694dbf202a591d9f13f5d666 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 3 Jul 2023 12:39:40 +0000 Subject: Avoid negation of test. --- searchlib/src/tests/sort/sort_test.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/searchlib/src/tests/sort/sort_test.cpp b/searchlib/src/tests/sort/sort_test.cpp index 6897bb1d31f..614253b1393 100644 --- a/searchlib/src/tests/sort/sort_test.cpp +++ b/searchlib/src/tests/sort/sort_test.cpp @@ -134,7 +134,7 @@ TEST("testStringSort") search::radix_sort(LoadedStrings::ValueRadix(), LoadedStrings::ValueCompare(), search::AlwaysEof(), 1, &loaded[0], N, &radixScratchPad[0], 0); LoadedStrings::ValueCompare vc; for(size_t i(1); i < N; i++) { - ASSERT_TRUE( ! vc(loaded[i], loaded[i-1])); + ASSERT_FALSE(vc(loaded[i], loaded[i-1])); } } @@ -157,7 +157,7 @@ TEST("testSortSpec") SortSpec sortspec("-lowercase(name)", ucaFactory); EXPECT_EQUAL(sortspec.size(), 1u); EXPECT_EQUAL(sortspec[0]._field, "name"); - EXPECT_TRUE( ! sortspec[0]._ascending); + EXPECT_FALSE(sortspec[0]._ascending); EXPECT_TRUE(sortspec[0]._converter); EXPECT_TRUE(dynamic_cast(sortspec[0]._converter.get()) != nullptr); } @@ -166,7 +166,7 @@ TEST("testSortSpec") SortSpec sortspec("-uca(name,nn_no)", ucaFactory); EXPECT_EQUAL(sortspec.size(), 1u); EXPECT_EQUAL(sortspec[0]._field, "name"); - EXPECT_TRUE( ! sortspec[0]._ascending); + EXPECT_FALSE(sortspec[0]._ascending); EXPECT_TRUE(sortspec[0]._converter); EXPECT_TRUE(dynamic_cast(sortspec[0]._converter.get()) != nullptr); } @@ -174,7 +174,7 @@ TEST("testSortSpec") SortSpec sortspec("-uca(name,nn_no,PRIMARY)", ucaFactory); EXPECT_EQUAL(sortspec.size(), 1u); EXPECT_EQUAL(sortspec[0]._field, "name"); - EXPECT_TRUE( ! sortspec[0]._ascending); + EXPECT_FALSE(sortspec[0]._ascending); EXPECT_TRUE(sortspec[0]._converter); EXPECT_TRUE(dynamic_cast(sortspec[0]._converter.get()) != nullptr); } @@ -182,7 +182,7 @@ TEST("testSortSpec") SortSpec sortspec("-uca(name,nn_no,SECONDARY)", ucaFactory); EXPECT_EQUAL(sortspec.size(), 1u); EXPECT_EQUAL(sortspec[0]._field, "name"); - EXPECT_TRUE( ! sortspec[0]._ascending); + EXPECT_FALSE(sortspec[0]._ascending); EXPECT_TRUE(sortspec[0]._converter); EXPECT_TRUE(dynamic_cast(sortspec[0]._converter.get()) != nullptr); } @@ -190,7 +190,7 @@ TEST("testSortSpec") SortSpec sortspec("-uca(name,nn_no,TERTIARY)", ucaFactory); EXPECT_EQUAL(sortspec.size(), 1u); EXPECT_EQUAL(sortspec[0]._field, "name"); - EXPECT_TRUE( ! sortspec[0]._ascending); + EXPECT_FALSE(sortspec[0]._ascending); EXPECT_TRUE(sortspec[0]._converter); EXPECT_TRUE(dynamic_cast(sortspec[0]._converter.get()) != nullptr); } @@ -198,7 +198,7 @@ TEST("testSortSpec") SortSpec sortspec("-uca(name,nn_no,QUATERNARY)", ucaFactory); EXPECT_EQUAL(sortspec.size(), 1u); EXPECT_EQUAL(sortspec[0]._field, "name"); - EXPECT_TRUE( ! sortspec[0]._ascending); + EXPECT_FALSE(sortspec[0]._ascending); EXPECT_TRUE(sortspec[0]._converter); EXPECT_TRUE(dynamic_cast(sortspec[0]._converter.get()) != nullptr); } @@ -206,7 +206,7 @@ TEST("testSortSpec") SortSpec sortspec("-uca(name,nn_no,IDENTICAL)", ucaFactory); EXPECT_EQUAL(sortspec.size(), 1u); EXPECT_EQUAL(sortspec[0]._field, "name"); - EXPECT_TRUE( ! sortspec[0]._ascending); + EXPECT_FALSE(sortspec[0]._ascending); EXPECT_TRUE(sortspec[0]._converter); EXPECT_TRUE(dynamic_cast(sortspec[0]._converter.get()) != nullptr); } @@ -214,7 +214,7 @@ TEST("testSortSpec") SortSpec sortspec("-uca(name,zh)", ucaFactory); EXPECT_EQUAL(sortspec.size(), 1u); EXPECT_EQUAL(sortspec[0]._field, "name"); - EXPECT_TRUE( ! sortspec[0]._ascending); + EXPECT_FALSE(sortspec[0]._ascending); EXPECT_TRUE(sortspec[0]._converter); EXPECT_TRUE(dynamic_cast(sortspec[0]._converter.get()) != nullptr); } @@ -222,7 +222,7 @@ TEST("testSortSpec") SortSpec sortspec("-uca(name,finnes_ikke)", ucaFactory); EXPECT_EQUAL(sortspec.size(), 1u); EXPECT_EQUAL(sortspec[0]._field, "name"); - EXPECT_TRUE( ! sortspec[0]._ascending); + EXPECT_FALSE(sortspec[0]._ascending); EXPECT_TRUE(sortspec[0]._converter); EXPECT_TRUE(dynamic_cast(sortspec[0]._converter.get()) != nullptr); } -- cgit v1.2.3