diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-04-20 10:03:20 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-04-20 13:14:42 +0000 |
| commit | df1640de083b7b6f4a28f4b2ac7d5dd10cbb589b (patch) | |
| tree | f854abd1508ac10da1289e8b1c668e7366e27cab /searchlib/src/tests/attribute/enum_comparator | |
| parent | 7521c5f7b3fc280b081e1c9e8b809cd4ad18ab97 (diff) | |
- Signal that we are using the default comaparator with no additional or mutable state.
- Separate refering the stateless comparator, and creating new statefull comparators.
- Keep the Comparator creation close.
Diffstat (limited to 'searchlib/src/tests/attribute/enum_comparator')
| -rw-r--r-- | searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp | 17 |
1 files changed, 8 insertions, 9 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 a9efc22dc5a..3ab29797120 100644 --- a/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp +++ b/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp @@ -30,7 +30,7 @@ TEST("requireThatNumericLessIsWorking") NumericEnumStore es(false, DictionaryConfig::Type::BTREE); EnumIndex e1 = es.insert(10); EnumIndex e2 = es.insert(30); - auto cmp1 = es.make_comparator(); + const auto & cmp1 = es.get_comparator(); EXPECT_TRUE(cmp1.less(e1, e2)); EXPECT_FALSE(cmp1.less(e2, e1)); EXPECT_FALSE(cmp1.less(e1, e1)); @@ -44,7 +44,7 @@ TEST("requireThatNumericEqualIsWorking") NumericEnumStore es(false, DictionaryConfig::Type::BTREE); EnumIndex e1 = es.insert(10); EnumIndex e2 = es.insert(30); - auto cmp1 = es.make_comparator(); + const auto & cmp1 = es.get_comparator(); EXPECT_FALSE(cmp1.equal(e1, e2)); EXPECT_FALSE(cmp1.equal(e2, e1)); EXPECT_TRUE(cmp1.equal(e1, e1)); @@ -60,7 +60,7 @@ TEST("requireThatFloatLessIsWorking") EnumIndex e1 = es.insert(10.5); EnumIndex e2 = es.insert(30.5); EnumIndex e3 = es.insert(std::numeric_limits<float>::quiet_NaN()); - auto cmp1 = es.make_comparator(); + const auto & cmp1 = es.get_comparator(); EXPECT_TRUE(cmp1.less(e1, e2)); EXPECT_FALSE(cmp1.less(e2, e1)); EXPECT_FALSE(cmp1.less(e1, e1)); @@ -78,7 +78,7 @@ TEST("requireThatFloatEqualIsWorking") EnumIndex e1 = es.insert(10.5); EnumIndex e2 = es.insert(30.5); EnumIndex e3 = es.insert(std::numeric_limits<float>::quiet_NaN()); - auto cmp1 = es.make_comparator(); + const auto & cmp1 = es.get_comparator(); EXPECT_FALSE(cmp1.equal(e1, e2)); EXPECT_FALSE(cmp1.equal(e2, e1)); EXPECT_TRUE(cmp1.equal(e1, e1)); @@ -97,7 +97,7 @@ TEST("requireThatStringLessIsWorking") EnumIndex e1 = es.insert("Aa"); EnumIndex e2 = es.insert("aa"); EnumIndex e3 = es.insert("aB"); - auto cmp1 = es.make_comparator(); + const auto & cmp1 = es.get_comparator(); EXPECT_TRUE(cmp1.less(e1, e2)); // similar folded, fallback to regular EXPECT_FALSE(cmp1.less(e2, e1)); EXPECT_FALSE(cmp1.less(e1, e1)); @@ -114,7 +114,7 @@ TEST("requireThatStringEqualIsWorking") EnumIndex e1 = es.insert("Aa"); EnumIndex e2 = es.insert("aa"); EnumIndex e3 = es.insert("aB"); - auto cmp1 = es.make_comparator(); + const auto & cmp1 = es.get_comparator(); EXPECT_FALSE(cmp1.equal(e1, e2)); // similar folded, fallback to regular EXPECT_FALSE(cmp1.equal(e2, e1)); EXPECT_TRUE(cmp1.equal(e1, e1)); @@ -157,7 +157,7 @@ TEST("requireThatFoldedLessIsWorking") EnumIndex e2 = es.insert("aa"); EnumIndex e3 = es.insert("aB"); EnumIndex e4 = es.insert("Folded"); - auto cmp1 = es.make_folded_comparator(); + const auto & cmp1 = es.get_folded_comparator(); EXPECT_FALSE(cmp1.less(e1, e2)); // similar folded EXPECT_FALSE(cmp1.less(e2, e1)); // similar folded EXPECT_TRUE(cmp1.less(e2, e3)); // folded compare @@ -177,7 +177,7 @@ TEST("requireThatFoldedEqualIsWorking") EnumIndex e2 = es.insert("aa"); EnumIndex e3 = es.insert("aB"); EnumIndex e4 = es.insert("Folded"); - auto cmp1 = es.make_folded_comparator(); + const auto & cmp1 = es.get_folded_comparator(); EXPECT_TRUE(cmp1.equal(e1, e1)); // similar folded EXPECT_TRUE(cmp1.equal(e2, e1)); // similar folded EXPECT_TRUE(cmp1.equal(e2, e1)); @@ -191,7 +191,6 @@ TEST("requireThatFoldedEqualIsWorking") EXPECT_FALSE(cmp3.equal(EnumIndex(), e4)); // similar when prefix EXPECT_FALSE(cmp3.equal(e4, EnumIndex())); // similar when prefix EXPECT_TRUE(cmp3.equal(EnumIndex(), EnumIndex())); // similar when prefix - } } |