diff options
author | Håvard Pettersen <havardpe@yahooinc.com> | 2022-09-06 09:23:41 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@yahooinc.com> | 2022-09-06 11:34:18 +0000 |
commit | 5c68a7fb22ee043591143ef3ca7465566b2021b8 (patch) | |
tree | 6eebd334cc39dc89ee1b437a1865e4afc27ff47d /searchlib/src/tests/ranksetup | |
parent | 79161e86b4d2f60dd4288e3669a704b0abd16820 (diff) |
support mapping names in execution profiling output
use feature descriptions rather than raw feature names
drop single quotes from feature descriptions
Diffstat (limited to 'searchlib/src/tests/ranksetup')
-rw-r--r-- | searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp b/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp index 6d49704e7c1..50c089ce8dc 100644 --- a/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp +++ b/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp @@ -65,28 +65,28 @@ TEST_F("verify valid rank feature", RankFixture) { TEST_F("verify unknown feature", RankFixture) { EXPECT_FALSE(f1.verify("unknown", - {{equal, {Level::WARNING, "invalid rank feature 'unknown': unknown basename: 'unknown'"}}, - {equal, {Level::ERROR, "verification failed: rank feature 'unknown' (feature verification test)"}}})); + {{equal, {Level::WARNING, "invalid rank feature unknown: unknown basename: 'unknown'"}}, + {equal, {Level::ERROR, "verification failed: rank feature unknown (feature verification test)"}}})); } TEST_F("verify unknown output", RankFixture) { EXPECT_FALSE(f1.verify("value(1, 2, 3).3", - {{equal, {Level::WARNING, "invalid rank feature 'value(1,2,3).3': unknown output: '3'"}}, - {equal, {Level::ERROR, "verification failed: rank feature 'value(1, 2, 3).3' (feature verification test)"}}})); + {{equal, {Level::WARNING, "invalid rank feature value(1,2,3).3: unknown output: '3'"}}, + {equal, {Level::ERROR, "verification failed: rank feature value(1, 2, 3).3 (feature verification test)"}}})); } TEST_F("verify illegal input parameters", RankFixture) { EXPECT_FALSE(f1.verify("value.0", - {{equal, {Level::WARNING, "invalid rank feature 'value.0':" + {{equal, {Level::WARNING, "invalid rank feature value.0:" " The parameter list used for setting up rank feature value is not valid:" " Expected 1+1x parameter(s), but got 0"}}, - {equal, {Level::ERROR, "verification failed: rank feature 'value.0' (feature verification test)"}}})); + {equal, {Level::ERROR, "verification failed: rank feature value.0 (feature verification test)"}}})); } TEST_F("verify illegal feature name", RankFixture) { EXPECT_FALSE(f1.verify("value(2).", - {{equal, {Level::WARNING, "invalid rank feature 'value(2).': malformed name"}}, - {equal, {Level::ERROR, "verification failed: rank feature 'value(2).' (feature verification test)"}}})); + {{equal, {Level::WARNING, "invalid rank feature value(2).: malformed name"}}, + {equal, {Level::ERROR, "verification failed: rank feature value(2). (feature verification test)"}}})); } TEST_F("verify too deep dependency graph", RankFixture) { @@ -94,37 +94,37 @@ TEST_F("verify too deep dependency graph", RankFixture) { EXPECT_FALSE(f1.verify("chain(basic, 256, 4)", {{equal, {Level::WARNING, - "invalid rank feature 'value(4)': dependency graph too deep\n" - " ... needed by rank feature 'chain(basic,1,4)'\n" - " ... needed by rank feature 'chain(basic,2,4)'\n" - " ... needed by rank feature 'chain(basic,3,4)'\n" - " ... needed by rank feature 'chain(basic,4,4)'\n" - " ... needed by rank feature 'chain(basic,5,4)'\n" - " ... needed by rank feature 'chain(basic,6,4)'\n" - " ... needed by rank feature 'chain(basic,7,4)'\n" - " ... needed by rank feature 'chain(basic,8,4)'\n" - " ... needed by rank feature 'chain(basic,9,4)'\n" - " ... needed by rank feature 'chain(basic,10,4)'\n" + "invalid rank feature value(4): dependency graph too deep\n" + " ... needed by rank feature chain(basic,1,4)\n" + " ... needed by rank feature chain(basic,2,4)\n" + " ... needed by rank feature chain(basic,3,4)\n" + " ... needed by rank feature chain(basic,4,4)\n" + " ... needed by rank feature chain(basic,5,4)\n" + " ... needed by rank feature chain(basic,6,4)\n" + " ... needed by rank feature chain(basic,7,4)\n" + " ... needed by rank feature chain(basic,8,4)\n" + " ... needed by rank feature chain(basic,9,4)\n" + " ... needed by rank feature chain(basic,10,4)\n" " (skipped 241 entries)\n" - " ... needed by rank feature 'chain(basic,252,4)'\n" - " ... needed by rank feature 'chain(basic,253,4)'\n" - " ... needed by rank feature 'chain(basic,254,4)'\n" - " ... needed by rank feature 'chain(basic,255,4)'\n" - " ... needed by rank feature 'chain(basic,256,4)'\n"}}, + " ... needed by rank feature chain(basic,252,4)\n" + " ... needed by rank feature chain(basic,253,4)\n" + " ... needed by rank feature chain(basic,254,4)\n" + " ... needed by rank feature chain(basic,255,4)\n" + " ... needed by rank feature chain(basic,256,4)\n"}}, {regex, {Level::WARNING, "high stack usage: [0-9]+ bytes"}}, - {equal, {Level::ERROR, "verification failed: rank feature 'chain(basic, 256, 4)' (feature verification test)"}}})); + {equal, {Level::ERROR, "verification failed: rank feature chain(basic, 256, 4) (feature verification test)"}}})); } TEST_F("verify dependency cycle", RankFixture) { EXPECT_FALSE(f1.verify("chain(cycle, 4, 2)", {{equal, {Level::WARNING, - "invalid rank feature 'chain(cycle,2,2)': dependency cycle detected\n" - " ... needed by rank feature 'chain(cycle,1,2)'\n" - " ... needed by rank feature 'chain(cycle,2,2)'\n" - " ... needed by rank feature 'chain(cycle,3,2)'\n" - " ... needed by rank feature 'chain(cycle,4,2)'\n"}}, - {equal, {Level::ERROR, "verification failed: rank feature 'chain(cycle, 4, 2)' (feature verification test)"}}})); + "invalid rank feature chain(cycle,2,2): dependency cycle detected\n" + " ... needed by rank feature chain(cycle,1,2)\n" + " ... needed by rank feature chain(cycle,2,2)\n" + " ... needed by rank feature chain(cycle,3,2)\n" + " ... needed by rank feature chain(cycle,4,2)\n"}}, + {equal, {Level::ERROR, "verification failed: rank feature chain(cycle, 4, 2) (feature verification test)"}}})); } TEST_MAIN() { TEST_RUN_ALL(); } |