diff options
Diffstat (limited to 'searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp')
| -rw-r--r-- | searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp b/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp index 4e1e1c6d792..ccd30c72b0e 100644 --- a/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp +++ b/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp @@ -44,12 +44,12 @@ Test::requireThatNumericComparatorIsWorking() EnumIndex e1 = es.insert(10); EnumIndex e2 = es.insert(30); auto cmp1 = es.make_comparator(); - EXPECT_TRUE(cmp1(e1, e2)); - EXPECT_TRUE(!cmp1(e2, e1)); - EXPECT_TRUE(!cmp1(e1, e1)); + EXPECT_TRUE(cmp1.less(e1, e2)); + EXPECT_TRUE(!cmp1.less(e2, e1)); + EXPECT_TRUE(!cmp1.less(e1, e1)); auto cmp2 = es.make_comparator(20); - EXPECT_TRUE(cmp2(EnumIndex(), e2)); - EXPECT_TRUE(!cmp2(e2, EnumIndex())); + EXPECT_TRUE(cmp2.less(EnumIndex(), e2)); + EXPECT_TRUE(!cmp2.less(e2, EnumIndex())); } void @@ -60,15 +60,15 @@ Test::requireThatFloatComparatorIsWorking() EnumIndex e2 = es.insert(30.5); EnumIndex e3 = es.insert(std::numeric_limits<float>::quiet_NaN()); auto cmp1 = es.make_comparator(); - EXPECT_TRUE(cmp1(e1, e2)); - EXPECT_TRUE(!cmp1(e2, e1)); - EXPECT_TRUE(!cmp1(e1, e1)); - EXPECT_TRUE(cmp1(e3, e1)); // nan - EXPECT_TRUE(!cmp1(e1, e3)); // nan - EXPECT_TRUE(!cmp1(e3, e3)); // nan + EXPECT_TRUE(cmp1.less(e1, e2)); + EXPECT_TRUE(!cmp1.less(e2, e1)); + EXPECT_TRUE(!cmp1.less(e1, e1)); + EXPECT_TRUE(cmp1.less(e3, e1)); // nan + EXPECT_TRUE(!cmp1.less(e1, e3)); // nan + EXPECT_TRUE(!cmp1.less(e3, e3)); // nan auto cmp2 = es.make_comparator(20.5); - EXPECT_TRUE(cmp2(EnumIndex(), e2)); - EXPECT_TRUE(!cmp2(e2, EnumIndex())); + EXPECT_TRUE(cmp2.less(EnumIndex(), e2)); + EXPECT_TRUE(!cmp2.less(e2, EnumIndex())); } void @@ -79,14 +79,14 @@ Test::requireThatStringComparatorIsWorking() EnumIndex e2 = es.insert("aa"); EnumIndex e3 = es.insert("aB"); auto cmp1 = es.make_comparator(); - EXPECT_TRUE(cmp1(e1, e2)); // similar folded, fallback to regular - EXPECT_TRUE(!cmp1(e2, e1)); - EXPECT_TRUE(!cmp1(e1, e1)); - EXPECT_TRUE(cmp1(e2, e3)); // folded compare + EXPECT_TRUE(cmp1.less(e1, e2)); // similar folded, fallback to regular + EXPECT_TRUE(!cmp1.less(e2, e1)); + EXPECT_TRUE(!cmp1.less(e1, e1)); + EXPECT_TRUE(cmp1.less(e2, e3)); // folded compare EXPECT_TRUE(strcmp("aa", "aB") > 0); // regular auto cmp2 = es.make_comparator("AB"); - EXPECT_TRUE(cmp2(EnumIndex(), e3)); - EXPECT_TRUE(!cmp2(e3, EnumIndex())); + EXPECT_TRUE(cmp2.less(EnumIndex(), e3)); + EXPECT_TRUE(!cmp2.less(e3, EnumIndex())); } void @@ -124,16 +124,16 @@ Test::requireThatFoldedComparatorIsWorking() EnumIndex e3 = es.insert("aB"); EnumIndex e4 = es.insert("Folded"); auto cmp1 = es.make_folded_comparator(); - EXPECT_TRUE(!cmp1(e1, e2)); // similar folded - EXPECT_TRUE(!cmp1(e2, e1)); // similar folded - EXPECT_TRUE(cmp1(e2, e3)); // folded compare - EXPECT_TRUE(!cmp1(e3, e2)); // folded compare + EXPECT_TRUE(!cmp1.less(e1, e2)); // similar folded + EXPECT_TRUE(!cmp1.less(e2, e1)); // similar folded + EXPECT_TRUE(cmp1.less(e2, e3)); // folded compare + EXPECT_TRUE(!cmp1.less(e3, e2)); // folded compare auto cmp2 = es.make_folded_comparator("fol", false); auto cmp3 = es.make_folded_comparator("fol", true); - EXPECT_TRUE(cmp2(EnumIndex(), e4)); - EXPECT_TRUE(!cmp2(e4, EnumIndex())); - EXPECT_TRUE(!cmp3(EnumIndex(), e4)); // similar when prefix - EXPECT_TRUE(!cmp3(e4, EnumIndex())); // similar when prefix + EXPECT_TRUE(cmp2.less(EnumIndex(), e4)); + EXPECT_TRUE(!cmp2.less(e4, EnumIndex())); + EXPECT_TRUE(!cmp3.less(EnumIndex(), e4)); // similar when prefix + EXPECT_TRUE(!cmp3.less(e4, EnumIndex())); // similar when prefix } int |