Test must specify field type.

4 files changed, 10 insertions, 19 deletions

diff --git a/searchlib/src/tests/features/prod_features.cpp b/searchlib/src/tests/features/prod_features.cpp
index de436dffff1..5f70085b9ec 100644
--- a/searchlib/src/tests/features/prod_features.cpp
+++ b/searchlib/src/tests/features/prod_features.cpp
@@ -67,6 +67,7 @@ using AVC = search::attribute::Config;
 using AVBT = search::attribute::BasicType;
 using AVCT = search::attribute::CollectionType;
 using CollectionType = FieldInfo::CollectionType;
+using DataType = FieldInfo::DataType;
 
 const double EPS = 10e-6;
 
@@ -258,8 +259,8 @@ Test::testAttribute()
             .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, "sint")
             .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, "slong")
             .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, "sbyte")
-            .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, "sbool")
-            .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, "sebool")
+            .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, DataType::BOOL, "sbool")
+            .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, DataType::BOOL, "sebool")
             .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, "sfloat")
             .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, "sdouble")
             .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, "sstr")
@@ -410,8 +411,8 @@ Test::setupForAttributeTest(FtFeatureTest &ft, bool setup_env)
             .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, "slong")
             .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, "sdouble")
             .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, "sbyte")
-            .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, "sbool")
-            .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, "sebool");
+            .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, DataType::BOOL,"sbool")
+            .addField(FieldType::ATTRIBUTE, CollectionType::SINGLE, DataType::BOOL,"sebool");
     }
 
     for (const auto & attr : avs) {
diff --git a/searchlib/src/vespa/searchlib/features/attributefeature.cpp b/searchlib/src/vespa/searchlib/features/attributefeature.cpp
index c161a4a2d64..78804513ab7 100644
--- a/searchlib/src/vespa/searchlib/features/attributefeature.cpp
+++ b/searchlib/src/vespa/searchlib/features/attributefeature.cpp
@@ -356,7 +356,7 @@ createAttributeExecutor(uint32_t numOutputs, const IAttributeVector *attribute,
     if (attribute == nullptr) {
         LOG(warning, "The attribute vector '%s' was not found in the attribute manager, returning default values.",
                 attrName.c_str());
-        std::vector<feature_t> values(4, 0.0f);
+        std::vector<feature_t> values(numOutputs, 0.0f);
         return stash.create<ValueExecutor>(values);
     }
     CollectionType collectionType = attribute->getCollectionType();
diff --git a/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.cpp b/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.cpp
index be78e8c45f8..c0ca3b637b1 100644
--- a/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.cpp
+++ b/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.cpp
@@ -3,14 +3,11 @@
 #include <vespa/searchcommon/common/datatype.h>
 #include "indexenvironmentbuilder.h"
 
-namespace search {
-namespace fef {
-namespace test {
+namespace search::fef::test {
 
 IndexEnvironmentBuilder::IndexEnvironmentBuilder(IndexEnvironment &env) :
     _env(env)
 {
-    // empty
 }
 
 IndexEnvironmentBuilder &
@@ -34,6 +31,4 @@ IndexEnvironmentBuilder::addField(const FieldType &type,
     return *this;
 }
 
-} // namespace test
-} // namespace fef
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.h b/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.h
index e6a81a46008..edfa78e20f0 100644
--- a/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.h
+++ b/searchlib/src/vespa/searchlib/fef/test/indexenvironmentbuilder.h
@@ -3,9 +3,7 @@
 
 #include "indexenvironment.h"
 
-namespace search {
-namespace fef {
-namespace test {
+namespace search::fef::test {
 
 /**
  * This class is used to setup an IndexEnvironment for testing.
@@ -57,7 +55,4 @@ private:
     IndexEnvironment &_env;
 };
 
-} // namespace test
-} // namespace fef
-} // namespace search
-
+}