aboutsummaryrefslogtreecommitdiffstats
path: root/searchlib/src/tests/fef
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@oath.com>2017-09-27 14:29:25 +0000
committerTor Egge <Tor.Egge@oath.com>2017-09-27 14:29:25 +0000
commit392b29e382adf48f94f549a32f37ea8b68b5551b (patch)
tree4a5fb47c3021954ea817c7b9573121bc392e0cd9 /searchlib/src/tests/fef
parent47e00fae7c892362ac5c47a6ee96220f3d831ba1 (diff)
Validate data type as part of validating blueprint parameters.
Diffstat (limited to 'searchlib/src/tests/fef')
-rw-r--r--searchlib/src/tests/fef/parameter/parameter_test.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/searchlib/src/tests/fef/parameter/parameter_test.cpp b/searchlib/src/tests/fef/parameter/parameter_test.cpp
index 5fa0633f56e..2cff534d289 100644
--- a/searchlib/src/tests/fef/parameter/parameter_test.cpp
+++ b/searchlib/src/tests/fef/parameter/parameter_test.cpp
@@ -9,6 +9,7 @@ LOG_SETUP("parameter_test");
using namespace search::fef::test;
using CollectionType = search::fef::FieldInfo::CollectionType;
+using DataType = search::fef::FieldInfo::DataType;
namespace search {
namespace fef {
@@ -135,6 +136,7 @@ ParameterTest::testValidator()
IndexEnvironmentBuilder builder(env);
builder.addField(FieldType::INDEX, CollectionType::SINGLE, "foo")
.addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, "bar")
+ .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, DataType::TENSOR, "tbar")
.addField(FieldType::INDEX, CollectionType::ARRAY, "afoo")
.addField(FieldType::INDEX, CollectionType::WEIGHTEDSET, "wfoo")
.addField(FieldType::INDEX, CollectionType::SINGLE, "hybrid");
@@ -156,6 +158,8 @@ ParameterTest::testValidator()
EXPECT_TRUE(validate(env, SL().add("baz"), PDS().desc().feature()));
EXPECT_TRUE(validate(env, SL().add("123"), PDS().desc().number()));
EXPECT_TRUE(validate(env, SL().add("baz"), PDS().desc().string()));
+ EXPECT_TRUE(validate(env, SL().add("tbar"), PDS().desc().attributeField(ParameterCollection::ANY)));
+ EXPECT_TRUE(validate(env, SL().add("tbar"), PDS().desc().attribute(ParameterCollection::ANY)));
// first fail but second pass
EXPECT_TRUE(validate(env, SL().add("baz"), PDS().desc().field().desc().string()));
@@ -180,6 +184,8 @@ ParameterTest::testValidator()
EXPECT_FALSE(validate(env, SL().add("hybrid"), PDS().desc().attributeField(ParameterCollection::ANY)));
EXPECT_FALSE(validate(env, SL().add("12a"), PDS().desc().number()));
EXPECT_FALSE(validate(env, SL().add("a12"), PDS().desc().number()));
+ EXPECT_FALSE(validate(env, SL().add("tbar"), PDS().desc().attributeField(ParameterDataTypeSet::normalTypeSet(), ParameterCollection::ANY)));
+ EXPECT_FALSE(validate(env, SL().add("tbar"), PDS().desc().attribute(ParameterDataTypeSet::normalTypeSet(), ParameterCollection::ANY)));
// test repeat
PDS d1 = PDS().desc().field().repeat();