2 files changed, 14 insertions, 5 deletions
diff --git a/searchlib/src/tests/query/streaming/equiv_query_node_test.cpp b/searchlib/src/tests/query/streaming/equiv_query_node_test.cpp
index 72378385c78..3879b6f0d1d 100644
--- a/searchlib/src/tests/query/streaming/equiv_query_node_test.cpp
+++ b/searchlib/src/tests/query/streaming/equiv_query_node_test.cpp
@@ -3,6 +3,7 @@
 #include <vespa/searchlib/query/streaming/equiv_query_node.h>
 #include <vespa/searchlib/fef/matchdata.h>
 #include <vespa/searchlib/fef/simpletermdata.h>
+#include <vespa/searchlib/fef/test/indexenvironment.h>
 #include <vespa/searchlib/query/streaming/phrase_query_node.h>
 #include <vespa/searchlib/query/streaming/query.h>
 #include <vespa/searchlib/query/streaming/queryterm.h>
@@ -15,6 +16,7 @@ using search::fef::MatchData;
 using search::fef::SimpleTermData;
 using search::fef::TermFieldHandle;
 using search::fef::TermFieldMatchDataPosition;
+using search::fef::test::IndexEnvironment;
 using search::query::QueryBuilder;
 using search::query::Node;
 using search::query::SimpleQueryNodeTypes;
@@ -167,7 +169,8 @@ TEST_F(EquivQueryNodeTest, test_equiv_evaluate_and_unpack)
     auto tfmd1 = md->resolveTermField(handle1);
     tfmd0->setNeedInterleavedFeatures(true);
     tfmd1->setNeedInterleavedFeatures(true);
-    eqn.unpack_match_data(2, td, *md);
+    IndexEnvironment ie;
+    eqn.unpack_match_data(2, td, *md, ie);
     EXPECT_EQ(2, tfmd0->getDocId());
     EXPECT_EQ(3, tfmd0->getNumOccs());
     EXPECT_EQ(3, tfmd0->end() - tfmd0->begin());
diff --git a/searchlib/src/tests/query/streaming_query_test.cpp b/searchlib/src/tests/query/streaming_query_test.cpp
index 2129cb6805a..1aa359c9910 100644
--- a/searchlib/src/tests/query/streaming_query_test.cpp
+++ b/searchlib/src/tests/query/streaming_query_test.cpp
@@ -2,6 +2,7 @@
 
 #include <vespa/searchlib/fef/simpletermdata.h>
 #include <vespa/searchlib/fef/matchdata.h>
+#include <vespa/searchlib/fef/test/indexenvironment.h>
 #include <vespa/searchlib/query/streaming/dot_product_term.h>
 #include <vespa/searchlib/query/streaming/equiv_query_node.h>
 #include <vespa/searchlib/query/streaming/in_term.h>
@@ -24,6 +25,7 @@ using namespace search::streaming;
 using TermType = QueryTerm::Type;
 using search::fef::SimpleTermData;
 using search::fef::MatchData;
+using search::fef::test::IndexEnvironment;
 
 void assertHit(const Hit & h, uint32_t exp_field_id, uint32_t exp_element_id, int32_t exp_element_weight, size_t exp_position) {
     EXPECT_EQ(h.field_id(), exp_field_id);
@@ -774,7 +776,8 @@ TEST(StreamingQueryTest, test_in_term)
     q.add(12, 0, 1, 0);
     EXPECT_TRUE(term.evaluate());
     MatchData md(MatchData::params().numTermFields(2));
-    term.unpack_match_data(23, td, md);
+    IndexEnvironment ie;
+    term.unpack_match_data(23, td, md, ie);
     auto tmd0 = md.resolveTermField(0);
     EXPECT_NE(23, tmd0->getDocId());
     auto tmd2 = md.resolveTermField(1);
@@ -804,7 +807,8 @@ TEST(StreamingQueryTest, dot_product_term)
     q1.add(12, 0, 9, 0);
     EXPECT_TRUE(term.evaluate());
     MatchData md(MatchData::params().numTermFields(2));
-    term.unpack_match_data(23, td, md);
+    IndexEnvironment ie;
+    term.unpack_match_data(23, td, md, ie);
     auto tmd0 = md.resolveTermField(0);
     EXPECT_NE(23, tmd0->getDocId());
     auto tmd1 = md.resolveTermField(1);
@@ -849,7 +853,8 @@ check_wand_term(double limit, const vespalib::string& label)
     q1.add(12, 0, 4, 0);
     EXPECT_EQ(limit < exp_wand_score_field_11, term.evaluate());
     MatchData md(MatchData::params().numTermFields(2));
-    term.unpack_match_data(23, td, md);
+    IndexEnvironment ie;
+    term.unpack_match_data(23, td, md, ie);
     auto tmd0 = md.resolveTermField(0);
     EXPECT_NE(23, tmd0->getDocId());
     auto tmd1 = md.resolveTermField(1);
@@ -903,7 +908,8 @@ TEST(StreamingQueryTest, weighted_set_term)
     q1.add(12, 0, 10, 0);
     EXPECT_TRUE(term.evaluate());
     MatchData md(MatchData::params().numTermFields(2));
-    term.unpack_match_data(23, td, md);
+    IndexEnvironment ie;
+    term.unpack_match_data(23, td, md, ie);
     auto tmd0 = md.resolveTermField(0);
     EXPECT_NE(23, tmd0->getDocId());
     auto tmd1 = md.resolveTermField(1);